regen

41 files changed, 477 insertions, 477 deletions

diff --git a/regress/sbin/pfctl/pf1.loaded b/regress/sbin/pfctl/pf1.loaded
index b35b50cbdcf..acb383496a2 100644
--- a/regress/sbin/pfctl/pf1.loaded
+++ b/regress/sbin/pfctl/pf1.loaded
@@ -1,40 +1,40 @@
 @0 pass in all 
 [ Skip steps: i=end d=end f=4 p=2 sa=4 sp=2 da=4 dp=3 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in all 
 [ Skip steps: i=end d=end f=4 sa=4 da=4 dp=3 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in proto tcp from any port <= 1024 to any label "foo_bar" 
 [ Skip steps: i=end d=end f=4 p=5 sa=4 da=4 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in proto tcp from any to any port = smtp 
 [ Skip steps: i=end d=end p=5 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh 
 [ Skip steps: i=end d=end f=end sa=6 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 allow-opts 
 [ Skip steps: i=end d=end f=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass in inet proto tcp from 1.2.3.4 to any label "6:tcp:1.2.3.4::any:" 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 pass in inet proto tcp from 1.2.3.5 to any label "7:tcp:1.2.3.5::any:" 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf10.loaded b/regress/sbin/pfctl/pf10.loaded
index 6f3582db996..b24e63d7b92 100644
--- a/regress/sbin/pfctl/pf10.loaded
+++ b/regress/sbin/pfctl/pf10.loaded
@@ -1,150 +1,150 @@
 @0 pass in inet proto icmp all 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block drop in inet proto icmp all 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block drop in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block return-rst in inet proto tcp all 
 [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 block return-rst in inet6 proto tcp all 
 [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 block return-rst(ttl 10) in inet proto tcp all 
 [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block return-rst(ttl 10) in inet6 proto tcp all 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 block return-icmp(port-unr) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 block return-icmp(net-unr) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 block return-icmp(net-unr) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 block return-icmp(srcfail) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 block return-icmp(srcfail) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 block return-icmp(host-prohib) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 block return-icmp(host-prohib) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 block return-icmp(cutoff-preced) in inet proto icmp all 
 [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 block return-icmp(cutoff-preced) in inet proto icmp all 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @20 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @21 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @22 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @23 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @24 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @25 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @26 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @27 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @28 block return-icmp(srcfail, admin-unr) in all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @29 block return-icmp(srcfail, admin-unr) in all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf11.loaded b/regress/sbin/pfctl/pf11.loaded
index 3bab3df2239..925f1ce23fe 100644
--- a/regress/sbin/pfctl/pf11.loaded
+++ b/regress/sbin/pfctl/pf11.loaded
@@ -1,90 +1,90 @@
 @0 pass in inet proto icmp all icmp-type echorep 
 [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in inet proto icmp all icmp-type echorep code 0 
 [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in inet proto icmp all icmp-type 1 
 [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in inet proto icmp all icmp-type 1 code 1 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in inet6 proto ipv6-icmp all icmp6-type 0 
 [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 
 [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass in inet6 proto ipv6-icmp all icmp6-type unreach 
 [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 block drop in inet proto icmp all icmp-type echorep 
 [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 block drop in inet proto icmp all icmp-type echorep code 0 
 [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 block drop in inet proto icmp all icmp-type 1 
 [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 block drop in inet proto icmp all icmp-type 1 code 1 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 block drop in inet6 proto ipv6-icmp all icmp6-type 0 
 [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0 
 [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 block drop in inet6 proto ipv6-icmp all icmp6-type unreach 
 [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 block drop in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 pass in inet proto icmp all icmp-type unreach code needfrag 
 [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf12.loaded b/regress/sbin/pfctl/pf12.loaded
index 0a057b6ca2f..d4198c7a774 100644
--- a/regress/sbin/pfctl/pf12.loaded
+++ b/regress/sbin/pfctl/pf12.loaded
@@ -1,25 +1,25 @@
 @0 pass in inet from 127.0.0.1 to 127.0.0.0/8 
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf13.loaded b/regress/sbin/pfctl/pf13.loaded
index 0c289023cc7..48d9550b50d 100644
--- a/regress/sbin/pfctl/pf13.loaded
+++ b/regress/sbin/pfctl/pf13.loaded
@@ -1,80 +1,80 @@
 @0 pass in quick on enc0 fastroute all 
 [ Skip steps: i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in quick on enc0 fastroute inet all 
 [ Skip steps: i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in quick on enc0 fastroute inet6 all 
 [ Skip steps: p=6 sa=8 sp=end da=4 dp=6 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass out quick on tun0 route-to tun1 inet all 
 [ Skip steps: i=end d=6 f=5 p=6 sa=8 sp=end dp=6 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass out quick on tun0 route-to tun1 inet from any to 192.168.1.1 
 [ Skip steps: i=end d=6 p=6 sa=8 sp=end dp=6 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass out quick on tun0 route-to tun1 inet6 from any to fec0::1 
 [ Skip steps: i=end sa=8 sp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 block drop in on tun0 dup-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp 
 [ Skip steps: i=end d=end p=8 sa=8 sp=end da=8 dp=8 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block drop in on tun0 dup-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp 
 [ Skip steps: i=end d=end sp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 pass in quick on tun0 route-to tun1 inet from 192.168.1.1 to 10.1.1.1 
 [ Skip steps: i=end d=end p=10 sp=end dp=10 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 pass in quick on tun0 route-to tun1 inet6 from fec0::/64 to fec1::2 
 [ Skip steps: i=end d=end sp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 block drop in on tun0 reply-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp 
 [ Skip steps: i=end d=end p=12 sa=12 sp=end da=12 dp=12 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 block drop in on tun0 reply-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp 
 [ Skip steps: i=end d=end sp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 pass in quick on tun0 reply-to tun1 inet from 192.168.1.1 to 10.1.1.1 
 [ Skip steps: i=end d=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 pass in quick on tun0 reply-to tun1 inet6 from fec0::/64 to fec1::2 
 [ Skip steps: i=end d=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 pass in quick on tun0 dup-to (tun1 192.168.1.100) inet from 192.168.1.1 to 10.1.1.1 
 [ Skip steps: i=end d=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 pass in quick on tun0 dup-to (tun1 fec1::2) inet6 from fec0::/64 to fec1::2 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf14.loaded b/regress/sbin/pfctl/pf14.loaded
index 828ee63fe43..bfd0eba175a 100644
--- a/regress/sbin/pfctl/pf14.loaded
+++ b/regress/sbin/pfctl/pf14.loaded
@@ -1,30 +1,30 @@
 @0 pass in quick on lo0 inet6 from fe80::1 to fe80::1 
 [ Skip steps: i=end d=end f=end p=end sa=3 sp=end da=2 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in quick on lo0 inet6 from fe80::1 to fe80::1 
 [ Skip steps: i=end d=end f=end p=end sa=3 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in quick on lo0 inet6 from fe80::1 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in quick on lo0 inet6 from any to fe80::1 
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in quick on lo0 inet6 from fe80::1 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in quick on lo0 inet6 from any to fe80::1 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded
index e8ffb7e99e4..18e34fc88ec 100644
--- a/regress/sbin/pfctl/pf15.loaded
+++ b/regress/sbin/pfctl/pf15.loaded
@@ -1,70 +1,70 @@
 @0 scrub in on lo0 all no-df fragment reassemble 
 [ Skip steps: i=3 d=2 f=3 p=end sa=7 sp=end da=3 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 scrub in log on lo0 all min-ttl 25 fragment reassemble 
 [ Skip steps: i=3 f=3 p=end sa=7 sp=end da=3 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 scrub on lo0 all max-mss 224 fragment reassemble 
 [ Skip steps: p=end sa=7 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 scrub out log on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble 
 [ Skip steps: p=end sa=7 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 scrub in on lo0 all max-mss 224 fragment reassemble 
 [ Skip steps: i=6 d=end f=7 p=end sa=7 sp=end da=8 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 scrub in log on lo0 all fragment reassemble 
 [ Skip steps: d=end f=7 p=end sa=7 sp=end da=8 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 scrub in log on lo1 all fragment reassemble 
 [ Skip steps: d=end p=end sp=end da=8 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 scrub in on lo0 inet from (lo0) to any fragment reassemble 
 [ Skip steps: i=10 d=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 scrub in log on lo0 inet6 from (lo1) to 2000::1 fragment reassemble 
 [ Skip steps: i=10 d=end f=10 p=end sp=end da=10 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 scrub in log on lo0 inet6 from (lo0) to 2000::1 fragment reassemble 
 [ Skip steps: d=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=12 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 scrub in inet from 10.0.0.1 to 10.0.0.4 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 scrub in inet from 10.0.0.2 to 10.0.0.3 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 scrub in inet from 10.0.0.2 to 10.0.0.4 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf16.loaded b/regress/sbin/pfctl/pf16.loaded
index 1d63735aa7d..fc343ee0295 100644
--- a/regress/sbin/pfctl/pf16.loaded
+++ b/regress/sbin/pfctl/pf16.loaded
@@ -1,25 +1,25 @@
 @0 nat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 rdr on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 -> 10.0.0.10 port 22
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 binat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 scrub in on lo0 all fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 pass in on lo1 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf17.loaded b/regress/sbin/pfctl/pf17.loaded
index 0b87da8ae2a..89f2a1a30a2 100644
--- a/regress/sbin/pfctl/pf17.loaded
+++ b/regress/sbin/pfctl/pf17.loaded
@@ -1,150 +1,150 @@
 @0 no binat on lo0 inet from 192.168.1.1 to 10.1.2.3 
 [ Skip steps: i=end d=end f=21 p=2 sa=2 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 binat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
 [ Skip steps: i=end d=end f=21 sp=end da=5 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 binat on lo0 inet proto tcp from 192.168.1.2 to any -> 10.0.0.2
 [ Skip steps: i=end d=end f=21 sp=end da=5 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 binat on lo0 inet proto udp from 192.168.1.3 to any -> 10.0.0.3
 [ Skip steps: i=end d=end f=21 sp=end da=5 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 binat on lo0 inet proto icmp from 192.168.1.4 to any -> 10.0.0.4
 [ Skip steps: i=end d=end f=21 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 binat on lo0 inet from 192.168.1.5 to 172.16.1.1 -> 10.0.0.5
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 binat on lo0 inet from 192.168.1.6 to 172.16.1.2 -> 10.0.0.6
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 binat on lo0 inet from 192.168.1.7 to 172.16.2.0/24 -> 10.0.0.7
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 binat on lo0 inet from 192.168.2.0/24 to any -> 10.0.5.0/24
 [ Skip steps: i=end d=end f=21 p=end sp=end da=10 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 binat on lo0 inet from 192.168.2.0/28 to any -> 10.0.4.0/28
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 binat on lo0 inet from 192.168.2.0/30 to 192.168.3.1 -> 10.0.3.0/30
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 binat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 binat on lo0 inet from 1.1.1.1 to no-route -> 2.2.2.2
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 binat on lo0 inet from (lo0) to 1.1.1.1 -> 2.2.2.2
 [ Skip steps: i=end d=end f=21 p=end sp=end da=15 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1)
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 binat on lo0 inet from (lo0) to (lo1) -> (lo1)
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 binat on lo0 inet from 1.1.1.1 to <sometable:*> -> 2.2.2.2
 [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 binat on lo0 inet from 1.1.1.1 to ! <sometable:*> -> 2.2.2.2
 [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 binat on lo0 inet from 1.1.1.1 to (lo1) -> 2.2.2.2
 [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 binat on lo0 inet from 1.1.1.1 to ! (lo1) -> 2.2.2.2
 [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @20 binat on lo0 inet from (lo0) to <sometable:*> -> 2.2.2.2
 [ Skip steps: i=end d=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @21 binat on lo0 inet6 from ::1 to no-route -> ::2
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @22 binat on lo0 inet6 from (lo0) to ::1 -> ::2
 [ Skip steps: i=end d=end f=end p=end sp=end da=24 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @23 binat on lo0 inet6 from (lo0) to ::1 -> (lo1)
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @24 binat on lo0 inet6 from (lo0) to (lo1) -> (lo1)
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @25 binat on lo0 inet6 from ::1 to <sometable:*> -> ::2
 [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @26 binat on lo0 inet6 from ::1 to ! <sometable:*> -> ::2
 [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @27 binat on lo0 inet6 from ::1 to (lo1) -> ::2
 [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @28 binat on lo0 inet6 from ::1 to ! (lo1) -> ::2
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @29 binat on lo0 inet6 from (lo0) to <sometable:*> -> ::2
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf18.loaded b/regress/sbin/pfctl/pf18.loaded
index 21931581c39..efeaf123faa 100644
--- a/regress/sbin/pfctl/pf18.loaded
+++ b/regress/sbin/pfctl/pf18.loaded
@@ -1,100 +1,100 @@
 @0 no nat on lo0 inet from 192.168.1.1 to 10.1.2.3 
 [ Skip steps: i=16 d=end f=end p=2 sa=2 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 nat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
 [ Skip steps: i=16 d=end f=end sp=end da=5 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 nat on lo0 inet proto tcp from 192.168.1.2 to any -> 10.0.0.2
 [ Skip steps: i=16 d=end f=end sp=end da=5 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 nat on lo0 inet proto udp from 192.168.1.3 to any -> 10.0.0.3
 [ Skip steps: i=16 d=end f=end sp=end da=5 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 nat on lo0 inet proto icmp from 192.168.1.4 to any -> 10.0.0.4
 [ Skip steps: i=16 d=end f=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 nat on lo0 inet from 192.168.1.5 to 172.6.1.1 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sa=8 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 nat on lo0 inet from 192.168.1.5 to 172.14.1.2 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sa=8 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 nat on lo0 inet from 192.168.1.5 to 172.16.2.0/24 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 nat on lo0 inet from 192.168.1.6 to 172.6.1.1 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sa=11 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 nat on lo0 inet from 192.168.1.6 to 172.14.1.2 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sa=11 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 nat on lo0 inet from 192.168.1.6 to 172.16.2.0/24 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 nat on lo0 inet from 192.168.1.7 to 172.6.1.1 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sa=14 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 nat on lo0 inet from 192.168.1.7 to 172.14.1.2 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sa=14 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 nat on lo0 inet from 192.168.1.7 to 172.16.2.0/24 -> 127.0.0.1
 [ Skip steps: i=16 d=end f=end p=16 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 nat on lo0 inet from 192.168.0.0/24 to any -> (lo0)
 [ Skip steps: i=16 d=end f=end p=16 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 nat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
 [ Skip steps: d=end f=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 nat on ! lo0 inet proto udp all -> 10.0.0.8 static-port
 [ Skip steps: i=18 d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 nat on ! lo0 inet proto tcp all -> 10.0.0.8 static-port
 [ Skip steps: d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 nat on lo0 inet all -> 10.0.0.8
 [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 nat on tun0 inet all -> 10.0.0.8
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf19.loaded b/regress/sbin/pfctl/pf19.loaded
index dffd5cc07cf..6d637fcae23 100644
--- a/regress/sbin/pfctl/pf19.loaded
+++ b/regress/sbin/pfctl/pf19.loaded
@@ -1,45 +1,45 @@
 @0 rdr on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 -> 10.0.0.10 port 22
 [ Skip steps: i=5 d=end f=end p=end sp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=5 d=end f=end p=end sa=3 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=5 d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=5 d=end f=end p=end sa=5 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sa=7 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf2.loaded b/regress/sbin/pfctl/pf2.loaded
index 7ea117ee205..57339f61f06 100644
--- a/regress/sbin/pfctl/pf2.loaded
+++ b/regress/sbin/pfctl/pf2.loaded
@@ -1,110 +1,110 @@
 @0 block drop out log on tun0 all 
 [ Skip steps: i=12 f=6 p=2 sa=6 sp=end da=7 dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop in log on tun0 all 
 [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block return-rst out log on tun0 proto tcp all 
 [ Skip steps: i=12 f=6 p=4 sa=6 sp=end da=7 dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block return-rst in log on tun0 proto tcp all 
 [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block return-icmp(port-unr, port-unr) out log on tun0 proto udp all 
 [ Skip steps: i=12 f=6 p=6 sa=6 sp=end da=7 dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 block return-icmp(port-unr, port-unr) in log on tun0 proto udp all 
 [ Skip steps: i=12 sp=end da=7 dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 block drop out log quick on tun0 inet from ! 157.161.48.183 to any 
 [ Skip steps: i=12 f=12 p=13 sp=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block drop in quick on tun0 inet from any to 255.255.255.255 
 [ Skip steps: i=12 d=13 f=12 p=13 sp=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 block drop in log quick on tun0 inet from 10.0.0.0/8 to any 
 [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 block drop in log quick on tun0 inet from 172.16.0.0/12 to any 
 [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 block drop in log quick on tun0 inet from 192.168.0.0/16 to any 
 [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 block drop in log quick on tun0 inet from 255.255.255.255 to any 
 [ Skip steps: d=13 p=13 sp=end da=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 block drop in log quick from no-route to any 
 [ Skip steps: sp=end da=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state 
 [ Skip steps: i=end f=15 p=15 sa=end sp=end da=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state 
 [ Skip steps: i=end sa=end sp=end da=end dp=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 pass out on tun0 proto udp all keep state 
 [ Skip steps: i=end f=end p=17 sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 pass in on tun0 proto udp from any to any port = domain keep state 
 [ Skip steps: i=end f=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 pass out on tun0 proto tcp all keep state 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 pass in on tun0 proto tcp from any to any port = ssh keep state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 pass in on tun0 proto tcp from any to any port = smtp keep state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @20 pass in on tun0 proto tcp from any to any port = domain keep state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @21 pass in on tun0 proto tcp from any to any port = auth keep state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf20.loaded b/regress/sbin/pfctl/pf20.loaded
index c198bf2d691..8d0d87eafd1 100644
--- a/regress/sbin/pfctl/pf20.loaded
+++ b/regress/sbin/pfctl/pf20.loaded
@@ -1,60 +1,60 @@
 @0 nat on lo0 inet from 127.0.0.0/24 to 1.2.3.0/25 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=2 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 nat on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 nat on lo0 inet from 10.0.1.0/24 to 1.2.3.0/25 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 nat on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=4 d=end f=end p=end sa=2 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=4 d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=4 d=end f=end p=end sa=4 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sa=6 sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp -> 127.0.0.1 port 8021
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf21.loaded b/regress/sbin/pfctl/pf21.loaded
index 76257d854e2..b332c6eb15b 100644
--- a/regress/sbin/pfctl/pf21.loaded
+++ b/regress/sbin/pfctl/pf21.loaded
@@ -1,20 +1,20 @@
 @0 scrub in all fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 scrub in all fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 scrub in all fragment drop-ovl 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 scrub in all fragment crop 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf23.loaded b/regress/sbin/pfctl/pf23.loaded
index e346013c938..ca0dfd2b908 100644
--- a/regress/sbin/pfctl/pf23.loaded
+++ b/regress/sbin/pfctl/pf23.loaded
@@ -1,5 +1,5 @@
 @0 block drop in on ! lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf24.loaded b/regress/sbin/pfctl/pf24.loaded
index f9bcb1ac701..5b50d7d78dc 100644
--- a/regress/sbin/pfctl/pf24.loaded
+++ b/regress/sbin/pfctl/pf24.loaded
@@ -1,10 +1,10 @@
 @0 pass in proto tcp from any to any port = ssh 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in proto tcp from any to any port = ftp 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf25.loaded b/regress/sbin/pfctl/pf25.loaded
index 46d766e4d22..039eaa07a12 100644
--- a/regress/sbin/pfctl/pf25.loaded
+++ b/regress/sbin/pfctl/pf25.loaded
@@ -1,15 +1,15 @@
 @0 block drop in on ! lo0 inet from 127.0.0.0/8 to any 
 [ Skip steps: i=end d=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop in on ! lo0 inet6 from ::1 to any 
 [ Skip steps: i=end d=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf26.loaded b/regress/sbin/pfctl/pf26.loaded
index 48d3247cba6..f40e9e08b57 100644
--- a/regress/sbin/pfctl/pf26.loaded
+++ b/regress/sbin/pfctl/pf26.loaded
@@ -1,10 +1,10 @@
 @0 block drop in on lo0 inet from ! (lo0) to any 
 [ Skip steps: i=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop out on lo0 inet from any to ! (lo0) 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf27.loaded b/regress/sbin/pfctl/pf27.loaded
index ddce0c91baf..549f8a4ceed 100644
--- a/regress/sbin/pfctl/pf27.loaded
+++ b/regress/sbin/pfctl/pf27.loaded
@@ -1,60 +1,60 @@
 @0 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 nat on lo0 inet from 127.0.0.1 to any -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=4 sp=end da=4 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 nat on lo0 inet from any to 127.0.0.1 -> (lo0)
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 nat on lo0 inet from 127.0.0.1 to any -> (lo0)
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 nat on lo0 inet from any to (lo0) -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 rdr on lo0 inet from 127.0.0.1 to any -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=4 sp=end da=4 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 rdr on lo0 inet from any to 127.0.0.1 -> (lo0)
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 rdr on lo0 inet from 127.0.0.1 to any -> (lo0)
 [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 rdr on lo0 inet from any to (lo0) -> 127.0.0.1
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf28.loaded b/regress/sbin/pfctl/pf28.loaded
index 612069d6bdc..8f0000db255 100644
--- a/regress/sbin/pfctl/pf28.loaded
+++ b/regress/sbin/pfctl/pf28.loaded
@@ -1,30 +1,30 @@
 @0 block drop in log-all quick on lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop in log quick on lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block drop in log-all quick on lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block drop in log quick on lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block drop in log on lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 block drop in log-all on lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf29.loaded b/regress/sbin/pfctl/pf29.loaded
index bb6e394a23a..58085f5a307 100644
--- a/regress/sbin/pfctl/pf29.loaded
+++ b/regress/sbin/pfctl/pf29.loaded
@@ -1,15 +1,15 @@
 @0 rdr on lo0 inet proto tcp from any to 192.168.0.0/24 port 8000:8010 -> 127.0.0.1 port 8000:8010
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 rdr on lo0 inet proto tcp from any to 192.168.0.0/24 port 21:22 -> 127.0.0.1 port 179:180
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 rdr on lo0 inet proto tcp from any to 192.168.0.0/24 port 1000:3000 -> 127.0.0.1 port 22
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf3.loaded b/regress/sbin/pfctl/pf3.loaded
index ffcddbb8f5f..8dd24ed4a89 100644
--- a/regress/sbin/pfctl/pf3.loaded
+++ b/regress/sbin/pfctl/pf3.loaded
@@ -1,45 +1,45 @@
 @0 pass in all 
 [ Skip steps: i=end d=end f=end p=2 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in all 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block drop in proto tcp all flags FPUEW/FSRPAUEW 
 [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block drop in proto tcp all flags FS/FSRA 
 [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block drop in proto tcp all flags /FSRAW 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in proto udp all 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass in proto icmp all 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 pass in proto tcp all flags S/SA 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 pass in all flags S/SA 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf30.loaded b/regress/sbin/pfctl/pf30.loaded
index b7b2100f819..87ba028917a 100644
--- a/regress/sbin/pfctl/pf30.loaded
+++ b/regress/sbin/pfctl/pf30.loaded
@@ -1,5 +1,5 @@
 @0 block drop in on lo0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf31.loaded b/regress/sbin/pfctl/pf31.loaded
index 42187e55f67..38168f1ef12 100644
--- a/regress/sbin/pfctl/pf31.loaded
+++ b/regress/sbin/pfctl/pf31.loaded
@@ -1,90 +1,90 @@
 @0 block return in on lo0 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block return in on lo0 inet all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block return in on lo0 inet6 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block drop in on lo0 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block drop in on lo0 inet all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 block drop in on lo0 inet6 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 block drop in on lo0 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block drop in on lo0 inet all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 block drop in on lo0 inet6 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 block return in on lo0 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 block return in on lo0 inet all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 block return in on lo0 inet6 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 block drop in on lo0 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 block drop in on lo0 inet all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 block drop in on lo0 inet6 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 block return in on lo0 all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 block return in on lo0 inet all 
 [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 block return in on lo0 inet6 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf32.loaded b/regress/sbin/pfctl/pf32.loaded
index e11d580dfcb..213cb76e034 100644
--- a/regress/sbin/pfctl/pf32.loaded
+++ b/regress/sbin/pfctl/pf32.loaded
@@ -1,35 +1,35 @@
 @0 pass in inet from 10.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in inet from 10.1.0.0/16 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in inet from 10.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in inet from 192.168.37.0/25 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in inet from 192.168.37.0/24 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in inet from 192.168.0.0/16 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass in inet from 192.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf34.loaded b/regress/sbin/pfctl/pf34.loaded
index 150c1b127a8..bd0739f224b 100644
--- a/regress/sbin/pfctl/pf34.loaded
+++ b/regress/sbin/pfctl/pf34.loaded
@@ -1,10 +1,10 @@
 @0 pass in inet from any to 127.0.0.1 
 [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in inet6 from any to 2000::1 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf36.loaded b/regress/sbin/pfctl/pf36.loaded
index 5b5c7db3f37..fb78fa9b566 100644
--- a/regress/sbin/pfctl/pf36.loaded
+++ b/regress/sbin/pfctl/pf36.loaded
@@ -1,70 +1,70 @@
 @0 nat on lo0 inet from any to 127.0.0.1 -> { 127.0.0.1, 127.0.0.2 } round-robin
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 nat on lo0 inet from any to 127.0.0.1 -> { 127.0.0.1, 127.0.0.2 } round-robin
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 bitmask static-port
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 random
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 round-robin
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 rdr on lo0 inet from any to 127.0.0.1 -> { 127.0.0.1, 127.0.0.2 } round-robin
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 rdr on lo0 inet from any to 127.0.0.1 -> { 127.0.0.1, 127.0.0.2 } round-robin
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 bitmask
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 random
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.0/24 round-robin
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf38.loaded b/regress/sbin/pfctl/pf38.loaded
index 76af11f14ed..f1acd9d4238 100644
--- a/regress/sbin/pfctl/pf38.loaded
+++ b/regress/sbin/pfctl/pf38.loaded
@@ -1,20 +1,20 @@
 @0 pass in on tun0 proto tcp all user = 3 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in on tun0 proto tcp all group = 7 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in on tun0 proto tcp all user = 3 group = 0 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in on tun0 proto tcp all user = 0 group = 0 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf39.loaded b/regress/sbin/pfctl/pf39.loaded
index 6a95f7aa272..29c4849f605 100644
--- a/regress/sbin/pfctl/pf39.loaded
+++ b/regress/sbin/pfctl/pf39.loaded
@@ -1,45 +1,45 @@
 @0 pass in log quick on lo0 inet proto tcp all tos 0x08 keep state fragment label "blah" 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah 
 [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ]
-[ Queue: qname=blah qid=0 pqname= pqid=0 ]
+[ queue: qname=blah qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah 
 [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ]
-[ Queue: qname=blah qid=0 pqname= pqid=0 ]
+[ queue: qname=blah qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah 
 [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ]
-[ Queue: qname=blah qid=0 pqname= pqid=0 ]
+[ queue: qname=blah qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname=blah qid=0 pqname= pqid=0 ]
+[ queue: qname=blah qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in log quick on lo0 inet proto tcp all keep state 
 [ Skip steps: i=end d=end f=end p=7 sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass in log quick on lo0 inet proto tcp all tos 0x08 keep state label "blah" queue blah 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname=blah qid=0 pqname= pqid=0 ]
+[ queue: qname=blah qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 
 [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf4.loaded b/regress/sbin/pfctl/pf4.loaded
index ecbb360ded7..3e2f54e6798 100644
--- a/regress/sbin/pfctl/pf4.loaded
+++ b/regress/sbin/pfctl/pf4.loaded
@@ -1,230 +1,230 @@
 @0 block drop in all 
 [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop in proto tcp all 
 [ Skip steps: i=end d=end f=5 p=3 sa=5 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block drop in proto tcp all 
 [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block drop in proto udp all 
 [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block drop in all 
 [ Skip steps: i=end d=end p=9 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 block drop in inet from 10.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 block drop in inet from ! 10.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block drop in inet from 10.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 block drop in inet from 172.16.0.0/12 to any 
 [ Skip steps: i=end d=end da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 block drop in proto tcp from any port = ssh to any 
 [ Skip steps: i=end d=end f=14 p=30 sa=14 sp=11 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 block drop in proto tcp from any port = ssh to any 
 [ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 block drop in proto tcp from any port 21 >< 2048 to any 
 [ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 block drop in proto tcp from any port != 1234 to any 
 [ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 block drop in proto tcp from any port >= 80 to any 
 [ Skip steps: i=end d=end p=30 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 da=16 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 da=18 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end p=30 sa=22 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 da=20 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @20 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 da=22 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @21 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end p=30 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @22 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 da=24 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @23 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @24 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 da=26 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @25 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end p=30 sa=30 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @26 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 da=28 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @27 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @28 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 da=30 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @29 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @30 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=38 sp=34 da=32 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @31 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=end sa=38 sp=34 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @32 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=38 sp=34 da=34 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @33 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end p=end sa=38 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @34 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=38 sp=38 da=36 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @35 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=end sa=38 sp=38 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @36 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=38 sp=38 da=38 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @37 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end p=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @38 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=42 da=40 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @39 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=42 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @40 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=42 da=42 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @41 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end p=end sa=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @42 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=44 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @43 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @44 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @45 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf40.loaded b/regress/sbin/pfctl/pf40.loaded
index 0869befbb12..2f924b17ca2 100644
--- a/regress/sbin/pfctl/pf40.loaded
+++ b/regress/sbin/pfctl/pf40.loaded
@@ -1,130 +1,130 @@
 @0 scrub all fragment reassemble 
 [ Skip steps: i=end d=2 f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 scrub all fragment reassemble 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 scrub in all fragment reassemble 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 scrub out all fragment reassemble 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 scrub in all fragment reassemble 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 scrub all fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @0 block drop all 
 [ Skip steps: i=12 d=4 f=end p=2 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block return all 
 [ Skip steps: i=12 d=4 f=end sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block return-rst proto tcp all 
 [ Skip steps: i=12 d=4 f=end sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass out all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block drop in all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 block drop out all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 block drop all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 pass in all 
 [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 pass out all 
 [ Skip steps: f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 block drop on lo0 all 
 [ Skip steps: i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 pass on lo0 all 
 [ Skip steps: i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 block drop on lo0 all 
 [ Skip steps: d=17 f=end sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 pass proto tcp all flags S/SA 
 [ Skip steps: i=19 d=17 f=end sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 pass proto udp all keep state 
 [ Skip steps: i=19 f=end p=19 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 pass in proto udp all keep state 
 [ Skip steps: i=19 f=end p=19 sa=end sp=end da=end dp=19 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 pass out proto udp all keep state 
 [ Skip steps: d=end f=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 pass out on lo0 proto tcp from any to any port = smtp keep state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf44.loaded b/regress/sbin/pfctl/pf44.loaded
index 7a811bf9d39..43989b7d692 100644
--- a/regress/sbin/pfctl/pf44.loaded
+++ b/regress/sbin/pfctl/pf44.loaded
@@ -1,30 +1,30 @@
 @0 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment drop-ovl 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment crop 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf46.loaded b/regress/sbin/pfctl/pf46.loaded
index d193fd71fbf..1b6e73165f5 100644
--- a/regress/sbin/pfctl/pf46.loaded
+++ b/regress/sbin/pfctl/pf46.loaded
@@ -1,40 +1,40 @@
 @0 pass in on lo0 route-to { (pflog0 127.0.0.1), (pflog0 127.0.0.2) } round-robin inet all 
 [ Skip steps: i=end f=4 p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass out on lo0 route-to { (pflog0 127.0.0.1), (pflog0 127.0.0.2) } round-robin inet all 
 [ Skip steps: i=end f=4 p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in on lo0 route-to (pflog0 127.0.0.0/24) bitmask inet all 
 [ Skip steps: i=end f=4 p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass out on lo0 dup-to (pflog0 127.0.0.0/24) random inet all 
 [ Skip steps: i=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in on lo0 reply-to { pflog0, pflog0 } round-robin inet6 all 
 [ Skip steps: i=end d=6 p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in on lo0 reply-to (pflog0 127.0.0.0/28) source-hash 0x0123456789abcdef0123456789abcdef inet all 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass out on lo0 route-to (pflog0 127.0.0.0/24) source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 inet all 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 pass in on lo0 dup-to (pflog0 127.0.0.0/24) round-robin inet all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf47.loaded b/regress/sbin/pfctl/pf47.loaded
index 0ae68e540f9..fd1e626138d 100644
--- a/regress/sbin/pfctl/pf47.loaded
+++ b/regress/sbin/pfctl/pf47.loaded
@@ -1,300 +1,300 @@
 @0 pass in on lo0 all 
 [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in all label "any" 
 [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in on lo0 all label "lo0" 
 [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in on lo0 all label "lo0lo0" 
 [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in on lo0 all label "any" 
 [ Skip steps: i=end d=end p=35 sa=6 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in on lo0 inet all label "any" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass in on lo0 inet from 127.0.0.1 to any label "127.0.0.1" 
 [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 pass in on lo0 inet from 127.0.0.1 to any label "127.0.0.1127.0.0.1" 
 [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 pass in on lo0 inet from 127.0.0.1 to any label ":127.0.0.1:127.0.0.1:" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 pass in on lo0 inet from 127.0.0.0/8 to any label "127.0.0.0/8" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 pass in on lo0 inet from 127.0.0.0/16 to any label "127.0.0.0/16127.0.0.0/16" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 pass in on lo0 inet from 127.0.0.0/31 to any label ":127.0.0.0/31:127.0.0.0/31:" 
 [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 pass in on lo0 inet6 from fe80::1 to any label "fe80::1" 
 [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 pass in on lo0 inet6 from fe80::1 to any label "fe80::1fe80::1" 
 [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 pass in on lo0 inet6 from fe80::1 to any label ":fe80::1:fe80::1:" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 pass in on lo0 inet6 from ::/8 to any label "::/8" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 pass in on lo0 inet6 from fe00::/8 to any label "fe00::/8" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 pass in on lo0 inet6 from ::/64 to any label "::/64::/64" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 pass in on lo0 inet6 from fe80::/64 to any label "fe80::/64fe80::/64" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 pass in on lo0 inet6 from ::/127 to any label ":::/127:::/127:" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @20 pass in on lo0 inet6 from fe80::/127 to any label ":fe80::/127:fe80::/127:" 
 [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @21 pass in on lo0 all label "!any!" 
 [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @22 pass in on lo0 inet from any to (lo0) label "(lo0)" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @23 pass in on lo0 inet from any to (lo0) label "(lo0)(lo0)" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @24 pass in on lo0 inet from any to (lo0) label " (lo0) (lo0) " 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @25 pass in on lo0 inet from any to ! 127.0.0.0/8 label "! 127.0.0.0/8" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @26 pass in on lo0 inet from any to ! 127.0.0.0/16 label "! 127.0.0.0/16! 127.0.0.0/16" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @27 pass in on lo0 inet from any to ! 127.0.0.0/31 label " ! 127.0.0.0/31 ! 127.0.0.0/31 " 
 [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @28 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @29 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)! (lo0)" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @30 pass in on lo0 inet6 from any to ! (lo0) label " ! (lo0) ! (lo0) " 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @31 pass in on lo0 inet6 from any to ! ::/8 label "! ::/8" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @32 pass in on lo0 inet6 from any to ! ::/64 label "! ::/64! ::/64" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @33 pass in on lo0 inet6 from any to ! ::/127 label " ! ::/127 ! ::/127 " 
 [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @34 pass in on lo0 all label "xx" 
 [ Skip steps: i=end d=end f=59 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @35 pass in on lo0 proto tcp from any port = 28 to any label "28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @36 pass in on lo0 proto tcp from any port 28 >< 29 to any label "28><29" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @37 pass in on lo0 proto tcp from any port 28 <> 29 to any label "28<>29" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @38 pass in on lo0 proto tcp from any port != 28 to any label "!=28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @39 pass in on lo0 proto tcp from any port < 28 to any label "<28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @40 pass in on lo0 proto tcp from any port <= 28 to any label "<=28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @41 pass in on lo0 proto tcp from any port > 28 to any label ">28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @42 pass in on lo0 proto tcp from any port >= 28 to any label ">=28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @43 pass in on lo0 proto tcp from any port = 28 to any label "2828" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 sp=45 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @44 pass in on lo0 proto tcp from any port = 28 to any label "$28$28$" 
 [ Skip steps: i=end d=end f=59 sa=59 da=59 dp=46 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @45 pass in on lo0 all 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @46 pass in on lo0 proto udp from any to any port = 29 label "29" 
 [ Skip steps: i=end d=end f=59 p=49 sa=59 sp=59 da=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @47 pass in on lo0 proto udp from any to any port != 29 label "!=29!=29" 
 [ Skip steps: i=end d=end f=59 p=49 sa=59 sp=59 da=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @48 pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @49 pass in on lo0 all label "ip" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @50 pass in on lo0 proto esp all label "esp" 
 [ Skip steps: i=end d=end f=59 p=53 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @51 pass in on lo0 proto esp all label "espesp" 
 [ Skip steps: i=end d=end f=59 p=53 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @52 pass in on lo0 proto esp all label "-esp-esp-" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @53 pass in on lo0 proto 166 all label "166" 
 [ Skip steps: i=end d=end f=59 p=56 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @54 pass in on lo0 proto 166 all label "166166" 
 [ Skip steps: i=end d=end f=59 p=56 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @55 pass in on lo0 proto 166 all label "_166_166_" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @56 pass in on lo0 all label "56" 
 [ Skip steps: i=end d=end f=59 p=59 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @57 pass in on lo0 all label "5757" 
 [ Skip steps: i=end d=end f=59 p=59 sa=59 sp=59 da=59 dp=59 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @58 pass in on lo0 all label "%58%58%" 
 [ Skip steps: i=end d=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @59 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44" 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf49.loaded b/regress/sbin/pfctl/pf49.loaded
index fc40850c2f3..5822167af47 100644
--- a/regress/sbin/pfctl/pf49.loaded
+++ b/regress/sbin/pfctl/pf49.loaded
@@ -1,15 +1,15 @@
 @0 pass in on lo0 inet from 127.0.0.0/8 to any keep state 
 [ Skip steps: i=end d=end p=end sp=end da=2 dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in on lo0 inet6 from ::1 to any keep state 
 [ Skip steps: i=end d=end p=end sp=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block drop in on lo0 inet from any to 127.0.0.1 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf5.loaded b/regress/sbin/pfctl/pf5.loaded
index 546cace8e58..d60779455a5 100644
--- a/regress/sbin/pfctl/pf5.loaded
+++ b/regress/sbin/pfctl/pf5.loaded
@@ -1,40 +1,40 @@
 @0 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=2 da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 
 [ Skip steps: i=end d=end f=end p=end sa=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=4 da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 
 [ Skip steps: i=end d=end f=end p=end sa=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=6 da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 16 
 [ Skip steps: i=end d=end f=end p=end sa=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 6667 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 16 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf54.loaded b/regress/sbin/pfctl/pf54.loaded
index 18aba02ce55..c530460c273 100644
--- a/regress/sbin/pfctl/pf54.loaded
+++ b/regress/sbin/pfctl/pf54.loaded
@@ -1,5 +1,5 @@
 @0 scrub all random-id fragment reassemble 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf56.loaded b/regress/sbin/pfctl/pf56.loaded
index 77caaa32252..22fd4232e45 100644
--- a/regress/sbin/pfctl/pf56.loaded
+++ b/regress/sbin/pfctl/pf56.loaded
@@ -1,10 +1,10 @@
 @0 pass in proto tcp from any to any port = www keep state (tcp.established 60) 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in proto tcp from any to any port = www keep state (max 10, tcp.first 2) 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf7.loaded b/regress/sbin/pfctl/pf7.loaded
index c532722497d..83cf66ecad0 100644
--- a/regress/sbin/pfctl/pf7.loaded
+++ b/regress/sbin/pfctl/pf7.loaded
@@ -1,105 +1,105 @@
 @0 block drop out log on tun0 all 
 [ Skip steps: i=end f=6 p=2 sa=6 sp=end da=7 dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop in log on tun0 all 
 [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 block return-rst out log on tun0 proto tcp all 
 [ Skip steps: i=end f=6 p=4 sa=6 sp=end da=7 dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 block return-rst in log on tun0 proto tcp all 
 [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 block return-icmp(port-unr, port-unr) out log on tun0 proto udp all 
 [ Skip steps: i=end f=6 p=6 sa=6 sp=end da=7 dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 block return-icmp(port-unr, port-unr) in log on tun0 proto udp all 
 [ Skip steps: i=end sp=end da=7 dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 block drop out log quick on tun0 inet from ! 157.161.48.183 to any 
 [ Skip steps: i=end f=14 p=12 sp=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 block drop in quick on tun0 inet from any to 255.255.255.255 
 [ Skip steps: i=end d=12 f=14 p=12 sp=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 block drop in log quick on tun0 inet from 10.0.0.0/8 to any 
 [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 block drop in log quick on tun0 inet from 172.16.0.0/12 to any 
 [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 block drop in log quick on tun0 inet from 192.168.0.0/16 to any 
 [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 block drop in log quick on tun0 inet from 255.255.255.255 to any 
 [ Skip steps: i=end f=14 sp=end da=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state 
 [ Skip steps: i=end f=14 p=14 sa=end sp=end da=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state 
 [ Skip steps: i=end sa=end sp=end da=end dp=15 ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 pass out on tun0 proto udp all keep state 
 [ Skip steps: i=end f=end p=16 sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 pass in on tun0 proto udp from any to any port = domain keep state 
 [ Skip steps: i=end f=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 pass out on tun0 proto tcp all modulate state 
 [ Skip steps: i=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 pass in on tun0 proto tcp from any to any port = ssh modulate state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 pass in on tun0 proto tcp from any to any port = smtp modulate state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 pass in on tun0 proto tcp from any to any port = domain modulate state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @20 pass in on tun0 proto tcp from any to any port = auth modulate state 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf8.loaded b/regress/sbin/pfctl/pf8.loaded
index 9c56bdb62ba..4d540db2968 100644
--- a/regress/sbin/pfctl/pf8.loaded
+++ b/regress/sbin/pfctl/pf8.loaded
@@ -1,10 +1,10 @@
 @0 block drop out log on tun1 inet from ! 10.0.0.0/8 to any 
 [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop out log on tun1 inet from 10.1.2.3 to any 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf9.loaded b/regress/sbin/pfctl/pf9.loaded
index 2a1a3a678a5..84267398eab 100644
--- a/regress/sbin/pfctl/pf9.loaded
+++ b/regress/sbin/pfctl/pf9.loaded
@@ -1,10 +1,10 @@
 @0 block drop in on enc0 all 
 [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 block drop in on tun0 all 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
-[ Queue: qname= qid=0 pqname= pqid=0 ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]