adp: zone naming convention

optional/adp-dns-client.json

 {
 	"description": "DNS client",
-	"filter": [ { "in": "_fw", "out": "wan", "service": "dns" } ]
+	"filter": [ { "in": "_fw", "out": "adp-wan", "service": "dns" } ]
 }

optional/adp-http-client.json

 {
 	"description": "HTTP client",
-	"filter": [ { "in": "_fw", "out": "wan", "service": "http" } ]
+	"filter": [ { "in": "_fw", "out": "adp-wan", "service": "http" } ]
 }

optional/adp-ntp-client.json

 {
 	"description": "NTP client",
-	"filter": [ { "in": "_fw", "out": "wan", "service": "ntp" } ]
+	"filter": [ { "in": "_fw", "out": "adp-wan", "service": "ntp" } ]
 }

optional/adp-ping.json

@@ -2,7 +2,7 @@
 	"description": "Allow ICMP echo request",
 	"after": "adp-router",
 	"filter": [
-		{ "in": "wan", "service": "ping", "flow-limit": 3 },
+		{ "in": "adp-wan", "service": "ping", "flow-limit": 3 },
 		{ "service": "ping" }
 	]
 }

optional/adp-router.json

 {
 	"description": "Router",
 	"zone": {
-		"lan": { "iface": "$adp_lan_ifaces", "addr": "$adp_lan_addrs" }
+		"adp-lan": {
+			"iface": "$adp_lan_ifaces", "addr": "$adp_lan_addrs"
+		}
 	},
 	"filter": [
 		{
-			"in": "wan",
+			"in": "adp-wan",
 			"dest": "$adp_lan_private_addrs",
 			"action": "drop"
 		}
 	],
-	"policy": [ { "in": "lan", "out": "wan" } ],
-	"snat": [ { "out": "wan", "src": "$adp_lan_private_addrs" } ]
+	"policy": [ { "in": "adp-lan", "out": "adp-wan" } ],
+	"snat": [ { "out": "adp-wan", "src": "$adp_lan_private_addrs" } ]
 }

optional/adp-ssh-server.json

@@ -2,7 +2,7 @@
 	"description": "SSH server",
 	"filter": [
 		{
-			"in": "wan",
+			"in": "adp-wan",
 			"out": "_fw",
 			"service": "ssh",
 			"conn-limit": { "count": 1, "interval": 10 }