diff --git a/boot/loader.conf b/boot/loader.conf
index 2d4e8b5112..215419083e 100644
--- a/boot/loader.conf
+++ b/boot/loader.conf
@@ -5,4 +5,4 @@ hw.ata.wc="0"
 kern.ipc.nmbclusters="0"
 beastie_disable="NO"
 vm.kmem_size="435544320"
-vm.kmem_size_max="535544320"
\ No newline at end of file
+vm.kmem_size_max="535544320"
diff --git a/cf/conf/config.xml b/cf/conf/config.xml
index 63ba506487..dca1e3df15 100644
--- a/cf/conf/config.xml
+++ b/cf/conf/config.xml
@@ -36,7 +36,7 @@
 	</system>
 	<interfaces>
 		<lan>
-			<if>sis0</if>
+			<if>vr0</if>
 			<ipaddr>192.168.1.1</ipaddr>
 			<subnet>24</subnet>
 			<media></media>
@@ -50,7 +50,7 @@
 			-->
 		</lan>
 		<wan>
-			<if>sis1</if>
+			<if>vr1</if>
 			<mtu></mtu>
 			<ipaddr>dhcp</ipaddr>
 			<!-- *or* ipv4-address *or* 'pppoe' *or* 'pptp' *or* 'bigpond' -->
diff --git a/conf.default/config.xml b/conf.default/config.xml
index 7f590c649a..a010995b5e 100644
--- a/conf.default/config.xml
+++ b/conf.default/config.xml
@@ -35,7 +35,7 @@
 	</system>
 	<interfaces>
 		<lan>
-			<if>sis0</if>
+			<if>vr0</if>
 			<ipaddr>192.168.1.1</ipaddr>
 			<subnet>24</subnet>
 			<media></media>
@@ -49,7 +49,7 @@
 			-->
 		</lan>
 		<wan>
-			<if>sis1</if>
+			<if>vr1</if>
 			<mtu></mtu>
 			<ipaddr>dhcp</ipaddr>
 			<!-- *or* ipv4-address *or* 'pppoe' *or* 'pptp' *or* 'bigpond' -->
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 5075d18897..7020c10969 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -3042,7 +3042,7 @@ function create_firewall_outgoing_rules_to_itself() {
 			/* If the interface has a gateway we do not add a pass in rule. */
 			/* Some people use a TUN tunnel with public IP as a Multiwan interface */
 			if(interface_has_gateway("tun{$x}")) {
-				$rule .= "# Not adding default pass in rule for interface $friendlytunif - tun{$x} with a gateway!";
+				$rule .= "# Not adding default pass in rule for interface $friendlytunif - tun{$x} with a gateway!\n";
 			} elseif (!isset($config['system']['disablevpnrules'])) {
 				$rule .="pass in quick on tun{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n";
 			}
@@ -3055,7 +3055,7 @@ function create_firewall_outgoing_rules_to_itself() {
 			/* If the interface has a gateway we do not add a pass in rule. */
 			/* Some people use a TAP tunnel with public IP as a Multiwan interface */
 			if(interface_has_gateway("tap{$x}")) {
-				$rule .= "# Not adding default pass in rule for interface $friendlytapif - tap{$x} with a gateway!";
+				$rule .= "# Not adding default pass in rule for interface $friendlytapif - tap{$x} with a gateway!\n";
 			} elseif (!isset($config['system']['disablevpnrules'])) {
 				$rule .="pass in quick on tap{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n";
 			}
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index 46da1c185f..bb26ee8ccf 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -74,6 +74,7 @@ $g = array(
 	"embeddedbootupslice" => "/dev/ad0a",
 	"update_url" => "http://updates.pfSense.com/_updaters",
 	"update_manifest" => "http://updates.pfSense.com/manifest",
+	"firmware_update_text" => "(pfSense-*.tgz)",
 	"wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|wai|iwi|awi|wlan|rum)/",
 	"vlan_native_supp" => array("vge", "bfe", "dc", "fxp", "gem", "hme", "rl", "sis", "ste", "tl", "tx", "xl"),
 	"vlan_long_frame" =>  array("vge", "bfe", "bge", "dc", "em", "fxp", "gem", "hme", "ixgb", "le", "msk", "nge", "re", "rl", "sis", "sk", "ste", "ti", "tl", "tx", "txp", "vr", "xl", "bce", "ixgbe" )
@@ -85,4 +86,4 @@ $iptos = array("lowdelay", "throughput", "reliability");
 /* TCP flags */
 $tcpflags = array("syn", "ack", "fin", "rst", "psh", "urg");
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index 8e668bd217..fcecfae2c5 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -197,7 +197,7 @@ print_info_box($sig_warning);
 		  <td width="22%" valign="baseline" class="vncell">&nbsp;</td>
                   <td width="78%" class="vtable">
             <p>Click &quot;Enable firmware
-              upload&quot; below, then choose the image file (<?=$g['platform'];?>-*.tgz)
+              upload&quot; below, then choose the image file (<?=$g['firmware_update_text'];?>)
 			  to be uploaded.<br>Click &quot;Upgrade firmware&quot;
               to start the upgrade process.</p>
                     <?php if (!file_exists($d_sysrebootreqd_path)): ?>