tests/py: update for changed set name in payload

Original patch posted in the mailing list from Patrick, I have refreshed this so it applies on top of current HEAD. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
author: Pablo Neira Ayuso <pablo@netfilter.org> 2016-05-13 19:13:12 +0200
committer: Pablo Neira Ayuso <pablo@netfilter.org> 2016-05-13 19:19:51 +0200
commit: 14b68bb14eb7360219e65120e41b0ee496b6b3da (patch)
tree: d9b3cc4d3478c2f7bb66b8cb0974ec9ad852bdc9 /tests/py/ip6
parent: 01a5eaee44355cff75f4b320b995b40588b3eede (diff)
20 files changed, 717 insertions, 717 deletions
diff --git a/tests/py/ip6/dst.t.payload.inet b/tests/py/ip6/dst.t.payload.inet
index 348506d5..15914d96 100644
--- a/tests/py/ip6/dst.t.payload.inet
+++ b/tests/py/ip6/dst.t.payload.inet
@@ -29,34 +29,34 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # dst nexthdr { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 60 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst nexthdr { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 60 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000088  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 00000084  : 0 [end]	element 00000032  : 0 [end]	element 00000021  : 0 [end]	element 00000006  : 0 [end]	element 0000003a  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 60 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst nexthdr icmp
 inet test-inet input
@@ -103,22 +103,22 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # dst hdrlength { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 60 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst hdrlength { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 60 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/dst.t.payload.ip6 b/tests/py/ip6/dst.t.payload.ip6
index 3c778f93..3f6c8e15 100644
--- a/tests/py/ip6/dst.t.payload.ip6
+++ b/tests/py/ip6/dst.t.payload.ip6
@@ -21,28 +21,28 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # dst nexthdr { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 60 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst nexthdr { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 60 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000088  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 00000084  : 0 [end]	element 00000032  : 0 [end]	element 00000021  : 0 [end]	element 00000006  : 0 [end]	element 0000003a  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 60 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst nexthdr icmp
 ip6 test-ip6 input
@@ -77,19 +77,19 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # dst hdrlength { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 60 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # dst hdrlength { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 60 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 
diff --git a/tests/py/ip6/dup.t.payload b/tests/py/ip6/dup.t.payload
index 1df414cd..be507780 100644
--- a/tests/py/ip6/dup.t.payload
+++ b/tests/py/ip6/dup.t.payload
@@ -10,12 +10,12 @@ ip6 test test
   [ dup sreg_addr 1 sreg_dev 2 ]
 
 # dup to ip6 saddr map { abcd::1 : cafe::cafe } device eth0
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
         element 0000cdab 00000000 00000000 01000000  : 0000feca 00000000 00000000 feca0000 0 [end]
 ip6 test-ip6 input 
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 1 ]
+  [ lookup reg 1 set __map%d dreg 1 ]
   [ immediate reg 2 0x00000002 ]
   [ dup sreg_addr 1 sreg_dev 2 ]
 
diff --git a/tests/py/ip6/frag.t.payload.inet b/tests/py/ip6/frag.t.payload.inet
index a766f156..5916c867 100644
--- a/tests/py/ip6/frag.t.payload.inet
+++ b/tests/py/ip6/frag.t.payload.inet
@@ -13,14 +13,14 @@ inet test-inet output
   [ cmp neq reg 1 0x00000001 ]
 
 # frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000032  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]
 inet test-inet output
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 44 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag nexthdr esp
 inet test-inet output
@@ -67,24 +67,24 @@ inet test-inet output
   [ cmp gt reg 1 0x0000002d ]
 
 # frag reserved { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet output
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 44 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag reserved { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet output
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 44 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag frag-off 22
 inet test-inet output
@@ -121,26 +121,26 @@ inet test-inet output
   [ cmp gt reg 1 0x00006801 ]
 
 # frag frag-off { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000801  : 0 [end]	element 0000b801  : 0 [end]	element 00001802  : 0 [end]	element 0000c002  : 0 [end]
 inet test-inet output
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 2b @ 44 + 2 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag frag-off { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000801  : 0 [end]	element 0000b901  : 1 [end]
 inet test-inet output
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 2b @ 44 + 2 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag more-fragments 1
 inet test-inet output
@@ -188,22 +188,22 @@ inet test-inet output
   [ cmp gt reg 1 0x2d000000 ]
 
 # frag id { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 21000000  : 0 [end]	element 37000000  : 0 [end]	element 43000000  : 0 [end]	element 58000000  : 0 [end]
 inet test-inet output
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 4b @ 44 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag id { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 21000000  : 0 [end]	element 38000000  : 1 [end]
 inet test-inet output
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 4b @ 44 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/frag.t.payload.ip6 b/tests/py/ip6/frag.t.payload.ip6
index d7a2e9f8..ec37be41 100644
--- a/tests/py/ip6/frag.t.payload.ip6
+++ b/tests/py/ip6/frag.t.payload.ip6
@@ -9,12 +9,12 @@ ip6 test-ip6 output
   [ cmp neq reg 1 0x00000001 ]
 
 # frag nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000032  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]
 ip6 test-ip6 output
   [ exthdr load 1b @ 44 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag nexthdr esp
 ip6 test-ip6 output
@@ -49,20 +49,20 @@ ip6 test-ip6 output
   [ cmp gt reg 1 0x0000002d ]
 
 # frag reserved { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 output
   [ exthdr load 1b @ 44 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag reserved { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 output
   [ exthdr load 1b @ 44 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag frag-off 22
 ip6 test-ip6 output
@@ -91,22 +91,22 @@ ip6 test-ip6 output
   [ cmp gt reg 1 0x00006801 ]
 
 # frag frag-off { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000801  : 0 [end]	element 0000b801  : 0 [end]	element 00001802  : 0 [end]	element 0000c002  : 0 [end]
 ip6 test-ip6 output
   [ exthdr load 2b @ 44 + 2 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag frag-off { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000801  : 0 [end]	element 0000b901  : 1 [end]
 ip6 test-ip6 output 
   [ exthdr load 2b @ 44 + 2 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag more-fragments 1
 ip6 test-ip6 output
@@ -142,18 +142,18 @@ ip6 test-ip6 output
   [ cmp gt reg 1 0x2d000000 ]
 
 # frag id { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 21000000  : 0 [end]	element 37000000  : 0 [end]	element 43000000  : 0 [end]	element 58000000  : 0 [end]
 ip6 test-ip6 output
   [ exthdr load 4b @ 44 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # frag id { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 21000000  : 0 [end]	element 38000000  : 1 [end]
 ip6 test-ip6 output
   [ exthdr load 4b @ 44 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/hbh.t.payload.inet b/tests/py/ip6/hbh.t.payload.inet
index e9a583f6..5fcd2fde 100644
--- a/tests/py/ip6/hbh.t.payload.inet
+++ b/tests/py/ip6/hbh.t.payload.inet
@@ -29,34 +29,34 @@ inet test-inet filter-input
   [ cmp gt reg 1 0x0000002d ]
 
 # hbh hdrlength {33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet filter-input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 0 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh hdrlength { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet filter-input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 0 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000032  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]	element 0000003a  : 0 [end]
 inet test-inet filter-input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 0 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr 22
 inet test-inet filter-input
@@ -89,24 +89,24 @@ inet test-inet filter-input
   [ cmp gt reg 1 0x0000002d ]
 
 # hbh nexthdr {33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet filter-input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 0 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet filter-input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 0 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr ip
 inet test-inet filter-input
diff --git a/tests/py/ip6/hbh.t.payload.ip6 b/tests/py/ip6/hbh.t.payload.ip6
index a201ef56..a2b46335 100644
--- a/tests/py/ip6/hbh.t.payload.ip6
+++ b/tests/py/ip6/hbh.t.payload.ip6
@@ -21,28 +21,28 @@ ip6 test-ip6 filter-input
   [ cmp gt reg 1 0x0000002d ]
 
 # hbh hdrlength {33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 filter-input
   [ exthdr load 1b @ 0 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh hdrlength { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 filter-input
   [ exthdr load 1b @ 0 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000032  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]	element 0000003a  : 0 [end]
 ip6 test-ip6 filter-input
   [ exthdr load 1b @ 0 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr 22
 ip6 test-ip6 filter-input
@@ -67,20 +67,20 @@ ip6 test-ip6 filter-input
   [ cmp gt reg 1 0x0000002d ]
 
 # hbh nexthdr {33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 filter-input
   [ exthdr load 1b @ 0 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 filter-input
   [ exthdr load 1b @ 0 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # hbh nexthdr ip
 ip6 test-ip6 filter-input
diff --git a/tests/py/ip6/icmpv6.t.payload.ip6 b/tests/py/ip6/icmpv6.t.payload.ip6
index d13b7991..4b6f5412 100644
--- a/tests/py/ip6/icmpv6.t.payload.ip6
+++ b/tests/py/ip6/icmpv6.t.payload.ip6
@@ -119,36 +119,36 @@ ip6 test-ip6 input
   [ immediate reg 0 accept ]
 
 # icmpv6 type {destination-unreachable, time-exceeded, nd-router-solicit} accept
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000001  : 0 [end]	element 00000003  : 0 [end]	element 00000085  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 1b @ transport header + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
 # icmpv6 type {router-renumbering, mld-listener-reduction, time-exceeded, nd-router-solicit} accept
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 0000008a  : 0 [end]	element 00000084  : 0 [end]	element 00000003  : 0 [end]	element 00000085  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 1b @ transport header + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
 # icmpv6 type {mld-listener-query, time-exceeded, nd-router-advert} accept
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000082  : 0 [end]	element 00000003  : 0 [end]	element 00000086  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 1b @ transport header + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
 # icmpv6 code 4
@@ -167,25 +167,25 @@ ip6 test-ip6 input
   [ cmp lte reg 1 0x00000042 ]
 
 # icmpv6 code {5, 6, 7} accept
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000005  : 0 [end]	element 00000006  : 0 [end]	element 00000007  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 1b @ transport header + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
 # icmpv6 code { 3-66}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000003  : 0 [end]	element 00000043  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 1b @ transport header + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 checksum 2222 log
 ip6 test-ip6 input
@@ -220,24 +220,24 @@ ip6 test-ip6 input
   [ log prefix (null) ]
 
 # icmpv6 checksum { 222, 226}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 0000de00  : 0 [end]	element 0000e200  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 checksum { 222-226}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 0000de00  : 0 [end]	element 0000e300  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 mtu 22
 ip6 test-ip6 input
@@ -270,24 +270,24 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x2d000000 ]
 
 # icmpv6 mtu {33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 21000000  : 0 [end]	element 37000000  : 0 [end]	element 43000000  : 0 [end]	element 58000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 4b @ transport header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 mtu {33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 21000000  : 0 [end]	element 38000000  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 4b @ transport header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 id 33-45
 ip6 test-ip6 input
@@ -306,24 +306,24 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x00002d00 ]
 
 # icmpv6 id {33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00002100  : 0 [end]	element 00003700  : 0 [end]	element 00004300  : 0 [end]	element 00005800  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 id {33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00002100  : 0 [end]	element 00003800  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 sequence 2
 ip6 test-ip6 input
@@ -333,25 +333,25 @@ ip6 test-ip6 input
   [ cmp eq reg 1 0x00000200 ]
 
 # icmpv6 sequence {3, 4, 5, 6, 7} accept
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000300  : 0 [end]	element 00000400  : 0 [end]	element 00000500  : 0 [end]	element 00000600  : 0 [end]	element 00000700  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
   [ immediate reg 0 accept ]
 
 # icmpv6 sequence {2, 4}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000200  : 0 [end]	element 00000400  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 sequence 2-4
 ip6 test-ip6 input
@@ -370,14 +370,14 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x00000400 ]
 
 # icmpv6 sequence { 2-4}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000200  : 0 [end]	element 00000500  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 max-delay 33-45
 ip6 test-ip6 input
@@ -396,22 +396,22 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x00002d00 ]
 
 # icmpv6 max-delay {33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00002100  : 0 [end]	element 00003700  : 0 [end]	element 00004300  : 0 [end]	element 00005800  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # icmpv6 max-delay {33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00002100  : 0 [end]	element 00003800  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]
   [ payload load 2b @ transport header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/ip6.t.payload.inet b/tests/py/ip6/ip6.t.payload.inet
index 35e77c17..c29c5a3f 100644
--- a/tests/py/ip6/ip6.t.payload.inet
+++ b/tests/py/ip6/ip6.t.payload.inet
@@ -31,15 +31,15 @@ inet test-inet input
   [ cmp neq reg 1 0x00000008 ]
 
 # ip6 dscp {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7, af11, af12, af13, af21, af22, af23, af31, af32, af33, af41, af42, af43, ef}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
         element 00000000  : 0 [end]     element 00000002  : 0 [end]     element 00000004  : 0 [end]     element 00000006  : 0 [end]    element 00000008  : 0 [end]      element 0000000a  : 0 [end]     element 0000000c  : 0 [end]     element 0000000e  : 0 [end]     element 00008002  : 0 [end]     element 00000003  : 0 [end]     element 00008003  : 0 [end]     element 00008004  : 0 [end]     element 00000005  : 0 [end]     element 00008005  : 0 [end]     element 00008006  : 0 [end]     element 00000007  : 0 [end]     element 00008007  : 0 [end]     element 00008008  : 0 [end]     element 00000009  : 0 [end]     element 00008009  : 0 [end]     element 0000800b  : 0 [end]
 inet test-inet input 
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 2b @ network header + 0 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x0000c00f ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 flowlabel 22
 inet test-inet input
@@ -58,26 +58,26 @@ inet test-inet input
   [ cmp neq reg 1 0x00e90000 ]
 
 # ip6 flowlabel { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00210000  : 0 [end]	element 00370000  : 0 [end]	element 00430000  : 0 [end]	element 00580000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 3b @ network header + 1 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x00ffff0f ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 flowlabel { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00210000  : 0 [end]	element 00380000  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 3b @ network header + 1 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x00ffff0f ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 length 22
 inet test-inet input
@@ -110,34 +110,34 @@ inet test-inet input
   [ cmp gt reg 1 0x00002d00 ]
 
 # ip6 length { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00002100  : 0 [end]	element 00003800  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 2b @ network header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr {udp, ah, comp, udplite, tcp, dccp, sctp}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 1b @ network header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000032  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]	element 0000003a  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 1b @ network header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr esp
 inet test-inet input
@@ -154,14 +154,14 @@ inet test-inet input
   [ cmp neq reg 1 0x00000032 ]
 
 # ip6 nexthdr { 33-44}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 0000002d  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 1b @ network header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr 33-44
 inet test-inet input
@@ -210,24 +210,24 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # ip6 hoplimit {33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 1b @ network header + 7 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 hoplimit {33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 1b @ network header + 7 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234
 inet test-inet input
diff --git a/tests/py/ip6/ip6.t.payload.ip6 b/tests/py/ip6/ip6.t.payload.ip6
index 7c9d1f5c..c2499237 100644
--- a/tests/py/ip6/ip6.t.payload.ip6
+++ b/tests/py/ip6/ip6.t.payload.ip6
@@ -23,13 +23,13 @@ ip6 test-ip6 input
   [ cmp neq reg 1 0x00000008 ]
 
 # ip6 dscp {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7, af11, af12, af13, af21, af22, af23, af31, af32, af33, af41, af42, af43, ef}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
         element 00000002  : 0 [end]     element 00000004  : 0 [end]     element 00000006  : 0 [end]     element 00000008  : 0 [end]    element 0000000a  : 0 [end]      element 0000000c  : 0 [end]     element 0000000e  : 0 [end]     element 00000000  : 0 [end]     element 00008002  : 0 [end]     element 00000003  : 0 [end]     element 00008003  : 0 [end]     element 00008004  : 0 [end]     element 00000005  : 0 [end]     element 00008005  : 0 [end]     element 00008006  : 0 [end]     element 00000007  : 0 [end]     element 00008007  : 0 [end]     element 00008008  : 0 [end]     element 00000009  : 0 [end]     element 00008009  : 0 [end]     element 0000800b  : 0 [end]
 ip6 test-ip6 input
   [ payload load 2b @ network header + 0 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x0000c00f ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 flowlabel 22
 ip6 test-ip6 input
@@ -44,22 +44,22 @@ ip6 test-ip6 input
   [ cmp neq reg 1 0x00e90000 ]
 
 # ip6 flowlabel { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00210000  : 0 [end]	element 00370000  : 0 [end]	element 00430000  : 0 [end]	element 00580000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 3b @ network header + 1 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x00ffff0f ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 flowlabel { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00210000  : 0 [end]	element 00380000  : 1 [end]
 ip6 test-ip6 input
   [ payload load 3b @ network header + 1 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x00ffff0f ) ^ 0x00000000 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 length 22
 ip6 test-ip6 input
@@ -84,28 +84,28 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x00002d00 ]
 
 # ip6 length { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00002100  : 0 [end]	element 00003800  : 1 [end]
 ip6 test-ip6 input
   [ payload load 2b @ network header + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr {udp, ah, comp, udplite, tcp, dccp, sctp}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr {esp, ah, comp, udp, udplite, tcp, dccp, sctp, icmpv6}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000032  : 0 [end]	element 00000033  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000088  : 0 [end]	element 00000006  : 0 [end]	element 00000021  : 0 [end]	element 00000084  : 0 [end]	element 0000003a  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr esp
 ip6 test-ip6 input
@@ -118,12 +118,12 @@ ip6 test-ip6 input
   [ cmp neq reg 1 0x00000032 ]
 
 # ip6 nexthdr { 33-44}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 0000002d  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 6 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 nexthdr 33-44
 ip6 test-ip6 input
@@ -160,20 +160,20 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # ip6 hoplimit {33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 7 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 hoplimit {33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ payload load 1b @ network header + 7 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234
 ip6 test-ip6 input
diff --git a/tests/py/ip6/map.t.payload b/tests/py/ip6/map.t.payload
index db7df27d..9b393a60 100644
--- a/tests/py/ip6/map.t.payload
+++ b/tests/py/ip6/map.t.payload
@@ -1,10 +1,10 @@
 # mark set ip6 saddr and ::ffff map { ::2 : 0x0000002a, ::ffff : 0x00000017}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00000000 00000000 00000000 02000000  : 0000002a 0 [end]	element 00000000 00000000 00000000 ffff0000  : 00000017 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
   [ bitwise reg 1 = (reg=1 & 0x00000000 0x00000000 0x00000000 0xffff0000 ) ^ 0x00000000 0x00000000 0x00000000 0x00000000 ]
-  [ lookup reg 1 set map%d dreg 1 ]
+  [ lookup reg 1 set __map%d dreg 1 ]
   [ meta set mark with reg 1 ]
 
diff --git a/tests/py/ip6/masquerade.t.payload.ip6 b/tests/py/ip6/masquerade.t.payload.ip6
index 778e709e..ded74c0a 100644
--- a/tests/py/ip6/masquerade.t.payload.ip6
+++ b/tests/py/ip6/masquerade.t.payload.ip6
@@ -87,14 +87,14 @@ ip6 test-ip6 postrouting
   [ masq flags 0x1c ]
 
 # tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000100  : 0 [end]	element 00000200  : 0 [end]	element 00000300  : 0 [end]	element 00000400  : 0 [end]	element 00000500  : 0 [end]	element 00000600  : 0 [end]	element 00000700  : 0 [end]	element 00000800  : 0 [end]	element 00006500  : 0 [end]	element 0000ca00  : 0 [end]	element 00002f01  : 0 [end]	element 0000e903  : 0 [end]	element 0000d207  : 0 [end]	element 0000bb0b  : 0 [end]
 ip6 test-ip6 postrouting
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
   [ masq ]
 
 # ip6 daddr fe00::1-fe00::200 udp dport 53 counter packets 0 bytes 0 masquerade
@@ -110,8 +110,8 @@ ip6 test-ip6 postrouting
   [ masq ]
 
 # iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } masquerade
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00001600  : 0 [end]	element 0000de00  : 0 [end]
 ip6 test-ip6 postrouting
   [ meta load iifname => reg 1 ]
@@ -122,7 +122,7 @@ ip6 test-ip6 postrouting
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
   [ masq ]
 
 # meta l4proto 6 masquerade to :1024
diff --git a/tests/py/ip6/mh.t.payload.inet b/tests/py/ip6/mh.t.payload.inet
index 8be80e25..5d065661 100644
--- a/tests/py/ip6/mh.t.payload.inet
+++ b/tests/py/ip6/mh.t.payload.inet
@@ -13,14 +13,14 @@ inet test-inet input
   [ cmp neq reg 1 0x00000001 ]
 
 # mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp }
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000088  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 00000084  : 0 [end]	element 00000032  : 0 [end]	element 00000021  : 0 [end]	element 00000006  : 0 [end]	element 0000003a  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh nexthdr icmp
 inet test-inet input
@@ -67,24 +67,24 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # mh nexthdr { 33, 55, 67, 88 }
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh nexthdr { 33-55 }
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh hdrlength 22
 inet test-inet input
@@ -117,34 +117,34 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # mh hdrlength { 33, 55, 67, 88 }
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh hdrlength { 33-55 }
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh type {binding-refresh-request, home-test-init, careof-test-init, home-test, careof-test, binding-update, binding-acknowledgement, binding-error, fast-binding-update, fast-binding-acknowledgement, fast-binding-advertisement, experimental-mobility-header, home-agent-switch-message}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000000  : 0 [end]	element 00000001  : 0 [end]	element 00000002  : 0 [end]	element 00000003  : 0 [end]	element 00000004  : 0 [end]	element 00000005  : 0 [end]	element 00000006  : 0 [end]	element 00000007  : 0 [end]	element 00000008  : 0 [end]	element 00000009  : 0 [end]	element 0000000a  : 0 [end]	element 0000000b  : 0 [end]	element 0000000c  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh type home-agent-switch-message
 inet test-inet input
@@ -191,24 +191,24 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # mh reserved { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh reserved { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 135 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh checksum 22
 inet test-inet input
@@ -241,22 +241,22 @@ inet test-inet input
   [ cmp gt reg 1 0x00002d00 ]
 
 # mh checksum { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00002100  : 0 [end]	element 00003700  : 0 [end]	element 00004300  : 0 [end]	element 00005800  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 2b @ 135 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh checksum { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00002100  : 0 [end]	element 00003800  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 2b @ 135 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/mh.t.payload.ip6 b/tests/py/ip6/mh.t.payload.ip6
index e903b74f..d5366a54 100644
--- a/tests/py/ip6/mh.t.payload.ip6
+++ b/tests/py/ip6/mh.t.payload.ip6
@@ -9,12 +9,12 @@ ip6 test-ip6 input
   [ cmp neq reg 1 0x00000001 ]
 
 # mh nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp }
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000088  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 00000084  : 0 [end]	element 00000032  : 0 [end]	element 00000021  : 0 [end]	element 00000006  : 0 [end]	element 0000003a  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh nexthdr icmp
 ip6 test-ip6 input
@@ -49,20 +49,20 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # mh nexthdr { 33, 55, 67, 88 }
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh nexthdr { 33-55 }
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh hdrlength 22
 ip6 test-ip6 input
@@ -87,28 +87,28 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # mh hdrlength { 33, 55, 67, 88 }
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh hdrlength { 33-55 }
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh type {binding-refresh-request, home-test-init, careof-test-init, home-test, careof-test, binding-update, binding-acknowledgement, binding-error, fast-binding-update, fast-binding-acknowledgement, fast-binding-advertisement, experimental-mobility-header, home-agent-switch-message}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000000  : 0 [end]	element 00000001  : 0 [end]	element 00000002  : 0 [end]	element 00000003  : 0 [end]	element 00000004  : 0 [end]	element 00000005  : 0 [end]	element 00000006  : 0 [end]	element 00000007  : 0 [end]	element 00000008  : 0 [end]	element 00000009  : 0 [end]	element 0000000a  : 0 [end]	element 0000000b  : 0 [end]	element 0000000c  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh type home-agent-switch-message
 ip6 test-ip6 input
@@ -143,20 +143,20 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # mh reserved { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh reserved { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 135 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh checksum 22
 ip6 test-ip6 input
@@ -181,18 +181,18 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x00002d00 ]
 
 # mh checksum { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00002100  : 0 [end]	element 00003700  : 0 [end]	element 00004300  : 0 [end]	element 00005800  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 2b @ 135 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # mh checksum { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00002100  : 0 [end]	element 00003800  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 2b @ 135 + 4 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/redirect.t.payload.ip6 b/tests/py/ip6/redirect.t.payload.ip6
index 4e78a244..80250caa 100644
--- a/tests/py/ip6/redirect.t.payload.ip6
+++ b/tests/py/ip6/redirect.t.payload.ip6
@@ -153,14 +153,14 @@ ip6 test-ip6 output
   [ redir proto_min reg 1 flags 0x18 ]
 
 # tcp dport { 1, 2, 3, 4, 5, 6, 7, 8, 101, 202, 303, 1001, 2002, 3003} redirect
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000100  : 0 [end]	element 00000200  : 0 [end]	element 00000300  : 0 [end]	element 00000400  : 0 [end]	element 00000500  : 0 [end]	element 00000600  : 0 [end]	element 00000700  : 0 [end]	element 00000800  : 0 [end]	element 00006500  : 0 [end]	element 0000ca00  : 0 [end]	element 00002f01  : 0 [end]	element 0000e903  : 0 [end]	element 0000d207  : 0 [end]	element 0000bb0b  : 0 [end]
 ip6 test-ip6 output
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
   [ redir ]
 
 # ip6 daddr fe00::1-fe00::200 udp dport 53 counter packets 0 bytes 0 redirect
@@ -176,8 +176,8 @@ ip6 test-ip6 output
   [ redir ]
 
 # iifname eth0 ct state new,established tcp dport vmap {22 : drop, 222 : drop } redirect
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00001600  : 0 [end]	element 0000de00  : 0 [end]
 ip6 test-ip6 output
   [ meta load iifname => reg 1 ]
@@ -188,17 +188,17 @@ ip6 test-ip6 output
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
   [ redir ]
 
 # ip6 nexthdr 6 redirect to tcp dport map { 22 : 8000, 80 : 8080}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00001600  : 0000401f 0 [end]	element 00005000  : 0000901f 0 [end]
 ip6 test-ip6 output
   [ payload load 1b @ network header + 6 => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 1 ]
+  [ lookup reg 1 set __map%d dreg 1 ]
   [ redir proto_min reg 1 ]
 
diff --git a/tests/py/ip6/rt.t.payload.inet b/tests/py/ip6/rt.t.payload.inet
index e7a71234..7d644fb1 100644
--- a/tests/py/ip6/rt.t.payload.inet
+++ b/tests/py/ip6/rt.t.payload.inet
@@ -13,14 +13,14 @@ inet test-inet input
   [ cmp neq reg 1 0x00000001 ]
 
 # rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000088  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 00000084  : 0 [end]	element 00000032  : 0 [end]	element 00000021  : 0 [end]	element 00000006  : 0 [end]	element 0000003a  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt nexthdr icmp
 inet test-inet input
@@ -67,24 +67,24 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt nexthdr { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt nexthdr { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt hdrlength 22
 inet test-inet input
@@ -117,24 +117,24 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt hdrlength { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt hdrlength { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt type 22
 inet test-inet input
@@ -167,24 +167,24 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt type { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt type { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt seg-left 22
 inet test-inet input
@@ -217,22 +217,22 @@ inet test-inet input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt seg-left { 33, 55, 67, 88}
-set%d test-inet 3
-set%d test-inet 0
+__set%d test-inet 3
+__set%d test-inet 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt seg-left { 33-55}
-set%d test-inet 7
-set%d test-inet 0
+__set%d test-inet 7
+__set%d test-inet 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ exthdr load 1b @ 43 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/rt.t.payload.ip6 b/tests/py/ip6/rt.t.payload.ip6
index f766ec0a..3245725b 100644
--- a/tests/py/ip6/rt.t.payload.ip6
+++ b/tests/py/ip6/rt.t.payload.ip6
@@ -9,12 +9,12 @@ ip6 test-ip6 input
   [ cmp neq reg 1 0x00000001 ]
 
 # rt nexthdr {udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000088  : 0 [end]	element 0000006c  : 0 [end]	element 00000011  : 0 [end]	element 00000033  : 0 [end]	element 00000084  : 0 [end]	element 00000032  : 0 [end]	element 00000021  : 0 [end]	element 00000006  : 0 [end]	element 0000003a  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt nexthdr icmp
 ip6 test-ip6 input
@@ -49,20 +49,20 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt nexthdr { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt nexthdr { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 0 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt hdrlength 22
 ip6 test-ip6 input
@@ -87,20 +87,20 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt hdrlength { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt hdrlength { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 1 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt type 22
 ip6 test-ip6 input
@@ -125,20 +125,20 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt type { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt type { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 2 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt seg-left 22
 ip6 test-ip6 input
@@ -163,18 +163,18 @@ ip6 test-ip6 input
   [ cmp gt reg 1 0x0000002d ]
 
 # rt seg-left { 33, 55, 67, 88}
-set%d test-ip6 3
-set%d test-ip6 0
+__set%d test-ip6 3
+__set%d test-ip6 0
 	element 00000021  : 0 [end]	element 00000037  : 0 [end]	element 00000043  : 0 [end]	element 00000058  : 0 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
 # rt seg-left { 33-55}
-set%d test-ip6 7
-set%d test-ip6 0
+__set%d test-ip6 7
+__set%d test-ip6 0
 	element 00000000  : 1 [end]	element 00000021  : 0 [end]	element 00000038  : 1 [end]
 ip6 test-ip6 input
   [ exthdr load 1b @ 43 + 3 => reg 1 ]
-  [ lookup reg 1 set set%d ]
+  [ lookup reg 1 set __set%d ]
 
diff --git a/tests/py/ip6/vmap.t.payload.inet b/tests/py/ip6/vmap.t.payload.inet
index f0312bf3..53f19eb9 100644
--- a/tests/py/ip6/vmap.t.payload.inet
+++ b/tests/py/ip6/vmap.t.payload.inet
@@ -1,420 +1,420 @@
 # ip6 saddr vmap { abcd::3 : accept }
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 0000cdab 00000000 00000000 03000000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34120000 34123412 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00003412 34123412 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34120000 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00003412 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34120000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 00003412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 34120000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 00003412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00000000 34123412 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00003412 34120000 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00000000 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00003412 34120000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 00000000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 00003412 34120000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 00000000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00000000 34120000 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00003412 00000000 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00000000 34120000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00003412 00000000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 00000000 34120000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::  : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 00003412 00000000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00000000 00000000 34123412 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00003412 00000000 34120000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00000000 00000000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00003412 00000000 34120000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:: : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 00000000 00000000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00000000 00000000 34120000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00003412 00000000 00000000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00000000 00000000 34120000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:: : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00003412 00000000 00000000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00000000 00000000 00000000 34123412  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00003412 00000000 00000000 34120000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:: : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 00000000 00000000 00000000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234 : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00000000 00000000 00000000 34120000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:: : accept}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 00003412 00000000 00000000 00000000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::/64 : accept}
-map%d test-inet f
-map%d test-inet 0
+__map%d test-inet f
+__map%d test-inet 0
 	element 00000000 00000000 00000000 00000000  : 0 [end]	element 00000000 01000000 00000000 00000000  : 1 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 aaaa0000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 bbbb0000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 cccc0000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop}
-map%d test-inet b
-map%d test-inet 0
+__map%d test-inet b
+__map%d test-inet 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 dddd0000  : 0 [end]
 inet test-inet input
   [ meta load nfproto => reg 1 ]
   [ cmp eq reg 1 0x0000000a ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
diff --git a/tests/py/ip6/vmap.t.payload.ip6 b/tests/py/ip6/vmap.t.payload.ip6
index 0701b9b3..620979f0 100644
--- a/tests/py/ip6/vmap.t.payload.ip6
+++ b/tests/py/ip6/vmap.t.payload.ip6
@@ -1,336 +1,336 @@
 # ip6 saddr vmap { abcd::3 : accept }
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 0000cdab 00000000 00000000 03000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34120000 34123412 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00003412 34123412 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34120000 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00003412 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34120000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 00003412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 34120000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 00003412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00000000 34123412 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00003412 34120000 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00000000 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00003412 34120000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 00000000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 00003412 34120000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 00000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00000000 34120000 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00003412 00000000 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00000000 34120000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00003412 00000000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 00000000 34120000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::  : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 00003412 00000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00000000 00000000 34123412 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00003412 00000000 34120000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00000000 00000000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00003412 00000000 34120000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:: : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 00000000 00000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00000000 00000000 34120000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00003412 00000000 00000000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00000000 00000000 34120000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:: : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00003412 00000000 00000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00000000 00000000 00000000 34123412  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00003412 00000000 00000000 34120000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:: : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 00000000 00000000 00000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234 : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00000000 00000000 00000000 34120000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:: : accept}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 00003412 00000000 00000000 00000000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::/64 : accept}
-map%d test-ip6 f
-map%d test-ip6 0
+__map%d test-ip6 f
+__map%d test-ip6 0
 	element 00000000 00000000 00000000 00000000  : 0 [end]	element 00000000 01000000 00000000 00000000  : 1 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 aaaa0000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 bbbb0000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 cccc0000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop}
-map%d test-ip6 b
-map%d test-ip6 0
+__map%d test-ip6 b
+__map%d test-ip6 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 dddd0000  : 0 [end]
 ip6 test-ip6 input
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
diff --git a/tests/py/ip6/vmap.t.payload.netdev b/tests/py/ip6/vmap.t.payload.netdev
index 3bacb88f..0ae5d5b0 100644
--- a/tests/py/ip6/vmap.t.payload.netdev
+++ b/tests/py/ip6/vmap.t.payload.netdev
@@ -1,420 +1,420 @@
 # ip6 saddr vmap { abcd::3 : accept }
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 0000cdab 00000000 00000000 03000000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34120000 34123412 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00003412 34123412 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34120000 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00003412 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34120000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 00003412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 34120000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 00003412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00000000 34123412 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00003412 34120000 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00000000 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00003412 34120000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 00000000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 00003412 34120000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 00000000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00000000 34120000 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00003412 00000000 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00000000 34120000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00003412 00000000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 00000000 34120000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:1234::  : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 00003412 00000000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00000000 00000000 34123412 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00003412 00000000 34120000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00000000 00000000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234::1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00003412 00000000 34120000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:1234:: : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 00000000 00000000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00000000 00000000 34120000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00003412 00000000 00000000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234::1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00000000 00000000 34120000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:1234:: : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00003412 00000000 00000000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234:1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00000000 00000000 00000000 34123412  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234::1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00003412 00000000 00000000 34120000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:1234:: : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 00000000 00000000 00000000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::1234 : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00000000 00000000 00000000 34120000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { 1234:: : accept}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 00003412 00000000 00000000 00000000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap { ::/64 : accept}
-map%d test-netdev f
-map%d test-netdev 0
+__map%d test-netdev f
+__map%d test-netdev 0
 	element 00000000 00000000 00000000 00000000  : 0 [end]	element 00000000 01000000 00000000 00000000  : 1 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 aaaa0000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 bbbb0000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 cccc0000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
 
 # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop}
-map%d test-netdev b
-map%d test-netdev 0
+__map%d test-netdev b
+__map%d test-netdev 0
 	element 34123412 34123412 34123412 0000aaaa  : 0 [end]	element 00000000 00000000 00000000 dddd0000  : 0 [end]
 netdev test-netdev ingress 
   [ meta load protocol => reg 1 ]
   [ cmp eq reg 1 0x0000dd86 ]
   [ payload load 16b @ network header + 8 => reg 1 ]
-  [ lookup reg 1 set map%d dreg 0 ]
+  [ lookup reg 1 set __map%d dreg 0 ]
author	Pablo Neira Ayuso <pablo@netfilter.org>	2016-05-13 19:13:12 +0200
committer	Pablo Neira Ayuso <pablo@netfilter.org>	2016-05-13 19:19:51 +0200
commit	14b68bb14eb7360219e65120e41b0ee496b6b3da (patch)
tree	d9b3cc4d3478c2f7bb66b8cb0974ec9ad852bdc9 /tests/py/ip6
parent	01a5eaee44355cff75f4b320b995b40588b3eede (diff)