diff --git a/Samples/one-interface/interfaces b/Samples/one-interface/interfaces
index 07a05ccf4..8daa23180 100755
--- a/Samples/one-interface/interfaces
+++ b/Samples/one-interface/interfaces
@@ -201,12 +201,6 @@
 #			significant but the list should have no embedded white
 #			space.
 #
-#	GATEWAY		This column is only meaningful if the 'default' OPTION
-#			is given -- it is ignored otherwise. You may specify
-#			the default gateway IP address for this interface here
-#			and Shorewall will use that IP address rather than any
-#			that it finds in the main routing table.
-#
 #	Example 1:	Suppose you have eth0 connected to a DSL modem and
 #			eth1 connected to your local network and that your
 #			local subnet is 192.168.1.0/24. The interface gets
@@ -236,6 +230,6 @@
 # http://shorewall.net/Documentation.htm#Interfaces
 #
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS			GATEWAY
+#ZONE	INTERFACE	BROADCAST	OPTIONS
 net     eth0            detect          norfc1918,routefilter,dhcp,tcpflags,logmartians,nosmurfs
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Samples/one-interface/policy b/Samples/one-interface/policy
index f05657d93..c5f7bd253 100644
--- a/Samples/one-interface/policy
+++ b/Samples/one-interface/policy
@@ -78,7 +78,7 @@
 #		KERNEL.INFO.
 ###############################################################################
 #SOURCE		DEST		POLICY		LOG LEVEL	LIMIT:BURST
-fw		net		ACCEPT
+$FW		net		ACCEPT
 net		all		DROP		info
 # The FOLLOWING POLICY MUST BE LAST
 all		all		REJECT		info
diff --git a/Samples/three-interfaces/interfaces b/Samples/three-interfaces/interfaces
index 0e7490330..461385c89 100755
--- a/Samples/three-interfaces/interfaces
+++ b/Samples/three-interfaces/interfaces
@@ -201,12 +201,6 @@
 #			significant but the list should have no embedded white
 #			space.
 #
-#	GATEWAY		This column is only meaningful if the 'default' OPTION
-#			is given -- it is ignored otherwise. You may specify
-#			the default gateway IP address for this interface here
-#			and Shorewall will use that IP address rather than any
-#			that it finds in the main routing table.
-#
 #	Example 1:	Suppose you have eth0 connected to a DSL modem and
 #			eth1 connected to your local network and that your
 #			local subnet is 192.168.1.0/24. The interface gets
@@ -236,7 +230,7 @@
 # http://shorewall.net/Documentation.htm#Interfaces
 #
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS			GATEWAY
+#ZONE	INTERFACE	BROADCAST	OPTIONS
 net     eth0            detect          tcpflags,dhcp,routefilter,norfc1918,nosmurfs,logmartians
 loc     eth1            detect          tcpflags,detectnets,nosmurfs
 dmz     eth2            detect          
diff --git a/Samples/three-interfaces/policy b/Samples/three-interfaces/policy
index 328b1eddc..fa5ea41d1 100644
--- a/Samples/three-interfaces/policy
+++ b/Samples/three-interfaces/policy
@@ -84,7 +84,7 @@
 loc		net		ACCEPT
 # If you want open access to the Internet from your Firewall 
 # remove the comment from the following line.
-#fw		net		ACCEPT
+#$FW		net		ACCEPT
 # Also If You Wish To Open Up DMZ Access To The Internet 
 # remove the comment from the following line.
 #dmz		net		ACCEPT
diff --git a/Samples/two-interfaces/interfaces b/Samples/two-interfaces/interfaces
index 3a603cc3f..d718366bb 100755
--- a/Samples/two-interfaces/interfaces
+++ b/Samples/two-interfaces/interfaces
@@ -201,12 +201,6 @@
 #			significant but the list should have no embedded white
 #			space.
 #
-#	GATEWAY		This column is only meaningful if the 'default' OPTION
-#			is given -- it is ignored otherwise. You may specify
-#			the default gateway IP address for this interface here
-#			and Shorewall will use that IP address rather than any
-#			that it finds in the main routing table.
-#
 #	Example 1:	Suppose you have eth0 connected to a DSL modem and
 #			eth1 connected to your local network and that your
 #			local subnet is 192.168.1.0/24. The interface gets
@@ -236,7 +230,7 @@
 # http://shorewall.net/Documentation.htm#Interfaces
 #
 ###############################################################################
-#ZONE	INTERFACE	BROADCAST	OPTIONS			GATEWAY
+#ZONE	INTERFACE	BROADCAST	OPTIONS
 net     eth0            detect          dhcp,tcpflags,norfc1918,routefilter,nosmurfs,logmartians
 loc     eth1            detect          tcpflags,detectnets,nosmurfs
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Samples/two-interfaces/policy b/Samples/two-interfaces/policy
index 1a8e76656..71a19285d 100644
--- a/Samples/two-interfaces/policy
+++ b/Samples/two-interfaces/policy
@@ -84,7 +84,7 @@
 loc		net		ACCEPT
 # If you want open access to the Internet from your Firewall 
 # remove the comment from the following line.
-#fw		net		ACCEPT
+#$FW		net		ACCEPT
 net		all		DROP		info
 # THE FOLLOWING POLICY MUST BE LAST
 all		all		REJECT		info