From fc7d496788b8abb3f009b73898508032eced0c6c Mon Sep 17 00:00:00 2001
From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Date: Tue, 6 Aug 2013 12:52:45 +0200
Subject: src: xml: delete unneeded XML prefixes

This patch changes some XML nodes with prefixes, as the example below
ilustrates.

Before:
<rule>
	<rule_flags/>
	<rule_family/>
<rule>

After:
<rule>
	<flags>
	<family>
</rule>

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/xmlfiles/01-table.xml          |  2 +-
 tests/xmlfiles/02-table.xml          |  2 +-
 tests/xmlfiles/20-rule-bitwise.xml   |  2 +-
 tests/xmlfiles/21-rule-byteorder.xml |  2 +-
 tests/xmlfiles/22-rule-cmp.xml       |  2 +-
 tests/xmlfiles/23-rule-counter.xml   |  2 +-
 tests/xmlfiles/24-rule-ct.xml        |  2 +-
 tests/xmlfiles/25-rule-exthdr.xml    |  2 +-
 tests/xmlfiles/26-rule-immediate.xml |  2 +-
 tests/xmlfiles/27-rule-limit.xml     |  2 +-
 tests/xmlfiles/28-rule-log.xml       |  2 +-
 tests/xmlfiles/29-rule-lookup.xml    |  2 +-
 tests/xmlfiles/30-rule-match.xml     |  2 +-
 tests/xmlfiles/31-rule-meta.xml      |  2 +-
 tests/xmlfiles/32-rule-nat6.xml      |  2 +-
 tests/xmlfiles/33-rule-nat4.xml      |  2 +-
 tests/xmlfiles/34-rule-payload.xml   |  2 +-
 tests/xmlfiles/35-rule-target.xml    |  2 +-
 tests/xmlfiles/36-rule-real.xml      |  2 +-
 tests/xmlfiles/37-rule-real.xml      |  2 +-
 tests/xmlfiles/38-rule-real.xml      |  2 +-
 tests/xmlfiles/39-rule-real.xml      |  2 +-
 tests/xmlfiles/40-rule-real.xml      |  2 +-
 tests/xmlfiles/41-rule-real.xml      |  2 +-
 tests/xmlfiles/42-rule-real.xml      |  2 +-
 tests/xmlfiles/43-rule-real.xml      |  2 +-
 tests/xmlfiles/44-rule-real.xml      |  2 +-
 tests/xmlfiles/45-rule-real.xml      |  2 +-
 tests/xmlfiles/46-rule-real.xml      |  2 +-
 tests/xmlfiles/47-rule-real.xml      |  2 +-
 tests/xmlfiles/48-rule-real.xml      |  2 +-
 tests/xmlfiles/49-rule-real.xml      |  2 +-
 tests/xmlfiles/50-rule-real.xml      |  2 +-
 tests/xmlfiles/51-rule-real.xml      |  2 +-
 tests/xmlfiles/52-rule-real.xml      |  2 +-
 tests/xmlfiles/53-rule-real.xml      |  2 +-
 tests/xmlfiles/54-rule-real.xml      |  2 +-
 tests/xmlfiles/55-rule-real.xml      |  2 +-
 tests/xmlfiles/56-rule-real.xml      |  2 +-
 tests/xmlfiles/57-rule-real.xml      |  2 +-
 tests/xmlfiles/58-rule-real.xml      |  2 +-
 tests/xmlfiles/59-rule-real.xml      |  2 +-
 tests/xmlfiles/60-rule-real.xml      |  2 +-
 tests/xmlfiles/61-rule-real.xml      |  2 +-
 tests/xmlfiles/62-rule-real.xml      |  2 +-
 tests/xmlfiles/63-rule-real.xml      |  2 +-
 tests/xmlfiles/64-rule-real.xml      |  2 +-
 tests/xmlfiles/65-rule-real.xml      |  2 +-
 tests/xmlfiles/66-rule-real.xml      |  2 +-
 tests/xmlfiles/67-rule-real.xml      |  2 +-
 tests/xmlfiles/68-rule-real.xml      |  2 +-
 tests/xmlfiles/69-rule-real.xml      |  2 +-
 tests/xmlfiles/70-rule-real.xml      |  2 +-
 tests/xmlfiles/71-rule-real.xml      |  2 +-
 tests/xmlfiles/72-rule-real.xml      |  2 +-
 tests/xmlfiles/73-set.xml            | 24 ++++++++++++------------
 tests/xmlfiles/74-set.xml            | 18 +++++++++---------
 57 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'tests/xmlfiles')

diff --git a/tests/xmlfiles/01-table.xml b/tests/xmlfiles/01-table.xml
index 2aa6492..b15ce6b 100644
--- a/tests/xmlfiles/01-table.xml
+++ b/tests/xmlfiles/01-table.xml
@@ -1,5 +1,5 @@
 <table>
 	<name>filter</name>
 	<family>ip</family>
-	<table_flags>0</table_flags>
+	<flags>0</flags>
 </table>
diff --git a/tests/xmlfiles/02-table.xml b/tests/xmlfiles/02-table.xml
index fa18d32..c58a0fb 100644
--- a/tests/xmlfiles/02-table.xml
+++ b/tests/xmlfiles/02-table.xml
@@ -1,5 +1,5 @@
 <table>
 	<name>nat</name>
 	<family>ip6</family>
-	<table_flags>0</table_flags>
+	<flags>0</flags>
 </table>
diff --git a/tests/xmlfiles/20-rule-bitwise.xml b/tests/xmlfiles/20-rule-bitwise.xml
index 86b2c6a..9ce65bf 100644
--- a/tests/xmlfiles/20-rule-bitwise.xml
+++ b/tests/xmlfiles/20-rule-bitwise.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="bitwise">
 		<sreg>1</sreg>
 		<dreg>1</dreg>
diff --git a/tests/xmlfiles/21-rule-byteorder.xml b/tests/xmlfiles/21-rule-byteorder.xml
index b19380c..b9aa97e 100644
--- a/tests/xmlfiles/21-rule-byteorder.xml
+++ b/tests/xmlfiles/21-rule-byteorder.xml
@@ -3,7 +3,7 @@
 	<table>test</table>
 	<chain>test</chain>
 	<handle>1000</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="byteorder">
 		<sreg>3</sreg>
 		<dreg>4</dreg>
diff --git a/tests/xmlfiles/22-rule-cmp.xml b/tests/xmlfiles/22-rule-cmp.xml
index aae6de9..77c8f81 100644
--- a/tests/xmlfiles/22-rule-cmp.xml
+++ b/tests/xmlfiles/22-rule-cmp.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>test</chain>
 	<handle>36</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="cmp">
 		<sreg>1</sreg>
 		<op>eq</op>
diff --git a/tests/xmlfiles/23-rule-counter.xml b/tests/xmlfiles/23-rule-counter.xml
index 0c56f4a..870f9fe 100644
--- a/tests/xmlfiles/23-rule-counter.xml
+++ b/tests/xmlfiles/23-rule-counter.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>test</chain>
 	<handle>39</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="counter">
 		<pkts>3</pkts>
 		<bytes>177</bytes>
diff --git a/tests/xmlfiles/24-rule-ct.xml b/tests/xmlfiles/24-rule-ct.xml
index f4d52c1..38edb4d 100644
--- a/tests/xmlfiles/24-rule-ct.xml
+++ b/tests/xmlfiles/24-rule-ct.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>state</key>
diff --git a/tests/xmlfiles/25-rule-exthdr.xml b/tests/xmlfiles/25-rule-exthdr.xml
index a29e857..ff42d62 100644
--- a/tests/xmlfiles/25-rule-exthdr.xml
+++ b/tests/xmlfiles/25-rule-exthdr.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="exthdr">
 		<dreg>1</dreg>
 		<exthdr_type>mh</exthdr_type>
diff --git a/tests/xmlfiles/26-rule-immediate.xml b/tests/xmlfiles/26-rule-immediate.xml
index dee0e7a..8fd5308 100644
--- a/tests/xmlfiles/26-rule-immediate.xml
+++ b/tests/xmlfiles/26-rule-immediate.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>input</chain>
 	<handle>32</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="immediate">
 		<dreg>0</dreg>
 		<immediatedata>
diff --git a/tests/xmlfiles/27-rule-limit.xml b/tests/xmlfiles/27-rule-limit.xml
index 7596429..aa6d607 100644
--- a/tests/xmlfiles/27-rule-limit.xml
+++ b/tests/xmlfiles/27-rule-limit.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="limit">
 		<rate>123123</rate>
 		<depth>321321</depth>
diff --git a/tests/xmlfiles/28-rule-log.xml b/tests/xmlfiles/28-rule-log.xml
index 976b29c..eed61a6 100644
--- a/tests/xmlfiles/28-rule-log.xml
+++ b/tests/xmlfiles/28-rule-log.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>test</chain>
 	<handle>96</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="log">
 		<prefix>test_chain</prefix>
 		<group>1</group>
diff --git a/tests/xmlfiles/29-rule-lookup.xml b/tests/xmlfiles/29-rule-lookup.xml
index 0df7709..89928e3 100644
--- a/tests/xmlfiles/29-rule-lookup.xml
+++ b/tests/xmlfiles/29-rule-lookup.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>test</chain>
 	<handle>37</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="lookup">
 		<set>set0</set>
 		<sreg>1</sreg>
diff --git a/tests/xmlfiles/30-rule-match.xml b/tests/xmlfiles/30-rule-match.xml
index 817b88f..3346976 100644
--- a/tests/xmlfiles/30-rule-match.xml
+++ b/tests/xmlfiles/30-rule-match.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="match">
 		<name>state</name>
 	</expr>
diff --git a/tests/xmlfiles/31-rule-meta.xml b/tests/xmlfiles/31-rule-meta.xml
index 1bce08b..0227e78 100644
--- a/tests/xmlfiles/31-rule-meta.xml
+++ b/tests/xmlfiles/31-rule-meta.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>test</chain>
 	<handle>36</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>iifname</key>
diff --git a/tests/xmlfiles/32-rule-nat6.xml b/tests/xmlfiles/32-rule-nat6.xml
index a80b4d4..5d38ac5 100644
--- a/tests/xmlfiles/32-rule-nat6.xml
+++ b/tests/xmlfiles/32-rule-nat6.xml
@@ -3,7 +3,7 @@
 	<table>nat</table>
 	<chain>OUTPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="nat">
 		<family>ip6</family>
 		<nat_type>snat</nat_type>
diff --git a/tests/xmlfiles/33-rule-nat4.xml b/tests/xmlfiles/33-rule-nat4.xml
index 05933af..6200ece 100644
--- a/tests/xmlfiles/33-rule-nat4.xml
+++ b/tests/xmlfiles/33-rule-nat4.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="nat">
 		<sreg_addr_min>1</sreg_addr_min>
 		<sreg_addr_max>2</sreg_addr_max>
diff --git a/tests/xmlfiles/34-rule-payload.xml b/tests/xmlfiles/34-rule-payload.xml
index bd344cc..9e48822 100644
--- a/tests/xmlfiles/34-rule-payload.xml
+++ b/tests/xmlfiles/34-rule-payload.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>test</chain>
 	<handle>34</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>2</offset>
diff --git a/tests/xmlfiles/35-rule-target.xml b/tests/xmlfiles/35-rule-target.xml
index 914bb9a..3c84538 100644
--- a/tests/xmlfiles/35-rule-target.xml
+++ b/tests/xmlfiles/35-rule-target.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>100</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="target">
 		<name>LOG</name>
 	</expr>
diff --git a/tests/xmlfiles/36-rule-real.xml b/tests/xmlfiles/36-rule-real.xml
index 5ba79b7..9178e2a 100644
--- a/tests/xmlfiles/36-rule-real.xml
+++ b/tests/xmlfiles/36-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>22</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>12</offset>
diff --git a/tests/xmlfiles/37-rule-real.xml b/tests/xmlfiles/37-rule-real.xml
index 42ea43a..ff7283b 100644
--- a/tests/xmlfiles/37-rule-real.xml
+++ b/tests/xmlfiles/37-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>25</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>iifname</key>
diff --git a/tests/xmlfiles/38-rule-real.xml b/tests/xmlfiles/38-rule-real.xml
index 08de9d3..18c349c 100644
--- a/tests/xmlfiles/38-rule-real.xml
+++ b/tests/xmlfiles/38-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>INPUT</chain>
 	<handle>30</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/39-rule-real.xml b/tests/xmlfiles/39-rule-real.xml
index de1692c..f69ef62 100644
--- a/tests/xmlfiles/39-rule-real.xml
+++ b/tests/xmlfiles/39-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>test</chain>
 	<handle>31</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>iifname</key>
diff --git a/tests/xmlfiles/40-rule-real.xml b/tests/xmlfiles/40-rule-real.xml
index 944b1bd..2630023 100644
--- a/tests/xmlfiles/40-rule-real.xml
+++ b/tests/xmlfiles/40-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>2</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/41-rule-real.xml b/tests/xmlfiles/41-rule-real.xml
index de951f8..762a7d9 100644
--- a/tests/xmlfiles/41-rule-real.xml
+++ b/tests/xmlfiles/41-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>3</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/42-rule-real.xml b/tests/xmlfiles/42-rule-real.xml
index d528a38..4bd9c6a 100644
--- a/tests/xmlfiles/42-rule-real.xml
+++ b/tests/xmlfiles/42-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>4</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/43-rule-real.xml b/tests/xmlfiles/43-rule-real.xml
index 0e6381c..eda5938 100644
--- a/tests/xmlfiles/43-rule-real.xml
+++ b/tests/xmlfiles/43-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>5</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/44-rule-real.xml b/tests/xmlfiles/44-rule-real.xml
index a9fc698..e66098a 100644
--- a/tests/xmlfiles/44-rule-real.xml
+++ b/tests/xmlfiles/44-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>6</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/45-rule-real.xml b/tests/xmlfiles/45-rule-real.xml
index ed4645d..1684eb3 100644
--- a/tests/xmlfiles/45-rule-real.xml
+++ b/tests/xmlfiles/45-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>7</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>9</offset>
diff --git a/tests/xmlfiles/46-rule-real.xml b/tests/xmlfiles/46-rule-real.xml
index 56cb088..00db686 100644
--- a/tests/xmlfiles/46-rule-real.xml
+++ b/tests/xmlfiles/46-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>8</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>9</offset>
diff --git a/tests/xmlfiles/47-rule-real.xml b/tests/xmlfiles/47-rule-real.xml
index 2ec3e19..caa247c 100644
--- a/tests/xmlfiles/47-rule-real.xml
+++ b/tests/xmlfiles/47-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>9</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>12</offset>
diff --git a/tests/xmlfiles/48-rule-real.xml b/tests/xmlfiles/48-rule-real.xml
index 36ca11b..1870646 100644
--- a/tests/xmlfiles/48-rule-real.xml
+++ b/tests/xmlfiles/48-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>10</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>9</offset>
diff --git a/tests/xmlfiles/49-rule-real.xml b/tests/xmlfiles/49-rule-real.xml
index ef968ac..021e461 100644
--- a/tests/xmlfiles/49-rule-real.xml
+++ b/tests/xmlfiles/49-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>11</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>9</offset>
diff --git a/tests/xmlfiles/50-rule-real.xml b/tests/xmlfiles/50-rule-real.xml
index 5b4bb2f..2ffa58a 100644
--- a/tests/xmlfiles/50-rule-real.xml
+++ b/tests/xmlfiles/50-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>12</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>state</key>
diff --git a/tests/xmlfiles/51-rule-real.xml b/tests/xmlfiles/51-rule-real.xml
index 1e5a46c..153b10f 100644
--- a/tests/xmlfiles/51-rule-real.xml
+++ b/tests/xmlfiles/51-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>13</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>direction</key>
diff --git a/tests/xmlfiles/52-rule-real.xml b/tests/xmlfiles/52-rule-real.xml
index 6cb3a0e..2c876b8 100644
--- a/tests/xmlfiles/52-rule-real.xml
+++ b/tests/xmlfiles/52-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>14</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>direction</key>
diff --git a/tests/xmlfiles/53-rule-real.xml b/tests/xmlfiles/53-rule-real.xml
index 1be6c89..4740d24 100644
--- a/tests/xmlfiles/53-rule-real.xml
+++ b/tests/xmlfiles/53-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>15</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>status</key>
diff --git a/tests/xmlfiles/54-rule-real.xml b/tests/xmlfiles/54-rule-real.xml
index caf9ebe..0e1616a 100644
--- a/tests/xmlfiles/54-rule-real.xml
+++ b/tests/xmlfiles/54-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>16</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>mark</key>
diff --git a/tests/xmlfiles/55-rule-real.xml b/tests/xmlfiles/55-rule-real.xml
index f452e50..3e0e308 100644
--- a/tests/xmlfiles/55-rule-real.xml
+++ b/tests/xmlfiles/55-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>17</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>secmark</key>
diff --git a/tests/xmlfiles/56-rule-real.xml b/tests/xmlfiles/56-rule-real.xml
index 3175803..6bd41a1 100644
--- a/tests/xmlfiles/56-rule-real.xml
+++ b/tests/xmlfiles/56-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>18</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>expiration</key>
diff --git a/tests/xmlfiles/57-rule-real.xml b/tests/xmlfiles/57-rule-real.xml
index 9c63ed4..da71196 100644
--- a/tests/xmlfiles/57-rule-real.xml
+++ b/tests/xmlfiles/57-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>19</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="ct">
 		<dreg>1</dreg>
 		<key>helper</key>
diff --git a/tests/xmlfiles/58-rule-real.xml b/tests/xmlfiles/58-rule-real.xml
index 0ba27a8..4590d94 100644
--- a/tests/xmlfiles/58-rule-real.xml
+++ b/tests/xmlfiles/58-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>20</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>len</key>
diff --git a/tests/xmlfiles/59-rule-real.xml b/tests/xmlfiles/59-rule-real.xml
index 1305516..be6a32d 100644
--- a/tests/xmlfiles/59-rule-real.xml
+++ b/tests/xmlfiles/59-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>21</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>protocol</key>
diff --git a/tests/xmlfiles/60-rule-real.xml b/tests/xmlfiles/60-rule-real.xml
index d7db206..d653f3a 100644
--- a/tests/xmlfiles/60-rule-real.xml
+++ b/tests/xmlfiles/60-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>22</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>mark</key>
diff --git a/tests/xmlfiles/61-rule-real.xml b/tests/xmlfiles/61-rule-real.xml
index 0d21968..3a215de 100644
--- a/tests/xmlfiles/61-rule-real.xml
+++ b/tests/xmlfiles/61-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>23</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>iif</key>
diff --git a/tests/xmlfiles/62-rule-real.xml b/tests/xmlfiles/62-rule-real.xml
index 7f2aba2..115a938 100644
--- a/tests/xmlfiles/62-rule-real.xml
+++ b/tests/xmlfiles/62-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>24</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>iifname</key>
diff --git a/tests/xmlfiles/63-rule-real.xml b/tests/xmlfiles/63-rule-real.xml
index e632d51..1ebc450 100644
--- a/tests/xmlfiles/63-rule-real.xml
+++ b/tests/xmlfiles/63-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>25</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>oif</key>
diff --git a/tests/xmlfiles/64-rule-real.xml b/tests/xmlfiles/64-rule-real.xml
index 9e11132..f6ac959 100644
--- a/tests/xmlfiles/64-rule-real.xml
+++ b/tests/xmlfiles/64-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>26</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>oifname</key>
diff --git a/tests/xmlfiles/65-rule-real.xml b/tests/xmlfiles/65-rule-real.xml
index 3cbdd13..e1b4624 100644
--- a/tests/xmlfiles/65-rule-real.xml
+++ b/tests/xmlfiles/65-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>27</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>skuid</key>
diff --git a/tests/xmlfiles/66-rule-real.xml b/tests/xmlfiles/66-rule-real.xml
index 4790065..562a5e3 100644
--- a/tests/xmlfiles/66-rule-real.xml
+++ b/tests/xmlfiles/66-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>28</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>skgid</key>
diff --git a/tests/xmlfiles/67-rule-real.xml b/tests/xmlfiles/67-rule-real.xml
index c3413e2..2134627 100644
--- a/tests/xmlfiles/67-rule-real.xml
+++ b/tests/xmlfiles/67-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>29</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="meta">
 		<dreg>1</dreg>
 		<key>secmark</key>
diff --git a/tests/xmlfiles/68-rule-real.xml b/tests/xmlfiles/68-rule-real.xml
index a63a51c..bc52f34 100644
--- a/tests/xmlfiles/68-rule-real.xml
+++ b/tests/xmlfiles/68-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>32</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>9</offset>
diff --git a/tests/xmlfiles/69-rule-real.xml b/tests/xmlfiles/69-rule-real.xml
index 02baab4..fa11b60 100644
--- a/tests/xmlfiles/69-rule-real.xml
+++ b/tests/xmlfiles/69-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>33</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/70-rule-real.xml b/tests/xmlfiles/70-rule-real.xml
index a459542..490ab67 100644
--- a/tests/xmlfiles/70-rule-real.xml
+++ b/tests/xmlfiles/70-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>34</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>9</offset>
diff --git a/tests/xmlfiles/71-rule-real.xml b/tests/xmlfiles/71-rule-real.xml
index 444b9ca..721e1ea 100644
--- a/tests/xmlfiles/71-rule-real.xml
+++ b/tests/xmlfiles/71-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>35</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>9</offset>
diff --git a/tests/xmlfiles/72-rule-real.xml b/tests/xmlfiles/72-rule-real.xml
index 64b4ec6..ddcc8be 100644
--- a/tests/xmlfiles/72-rule-real.xml
+++ b/tests/xmlfiles/72-rule-real.xml
@@ -3,7 +3,7 @@
 	<table>filter</table>
 	<chain>output</chain>
 	<handle>36</handle>
-	<rule_flags>0</rule_flags>
+	<flags>0</flags>
 	<expr type="payload">
 		<dreg>1</dreg>
 		<offset>16</offset>
diff --git a/tests/xmlfiles/73-set.xml b/tests/xmlfiles/73-set.xml
index 9c51548..e783dfa 100644
--- a/tests/xmlfiles/73-set.xml
+++ b/tests/xmlfiles/73-set.xml
@@ -1,38 +1,38 @@
 <set>
-	<set_name>set0</set_name>
-	<set_table>filter</set_table>
+	<name>set0</name>
+	<table>filter</table>
 	<family>ip</family>
-	<set_flags>0</set_flags>
+	<flags>0</flags>
 	<key_type>0</key_type>
 	<key_len>0</key_len>
 	<data_type>0</data_type>
 	<data_len>0</data_len>
 	<set_elem>
-		<set_elem_flags>0</set_elem_flags>
-		<set_elem_key>
+		<flags>0</flags>
+		<key>
 			<data_reg type="value">
 				<len>4</len>
 				<data0>0x0300a8c0</data0>
 			</data_reg>
-		</set_elem_key>
+		</key>
 	</set_elem>
 	<set_elem>
-		<set_elem_flags>0</set_elem_flags>
-		<set_elem_key>
+		<flags>0</flags>
+		<key>
 			<data_reg type="value">
 				<len>4</len>
 				<data0>0x0200a8c0</data0>
 			</data_reg>
-		</set_elem_key>
+		</key>
 	</set_elem>
 	<set_elem>
-		<set_elem_flags>0</set_elem_flags>
-		<set_elem_key>
+		<flags>0</flags>
+		<key>
 			<data_reg type="value">
 				<len>4</len>
 				<data0>0x0100a8c0</data0>
 			</data_reg>
-		</set_elem_key>
+		</key>
 	</set_elem>
 </set>
 <!-- nft add rule ip filter test ip daddr { 192.168.0.1, 192.168.0.2, 192.168.0.3 } tcp dport 443 counter accept -->
diff --git a/tests/xmlfiles/74-set.xml b/tests/xmlfiles/74-set.xml
index 9bfb9f9..3ac19a3 100644
--- a/tests/xmlfiles/74-set.xml
+++ b/tests/xmlfiles/74-set.xml
@@ -1,15 +1,15 @@
 <set>
-	<set_name>set0</set_name>
-	<set_table>filter</set_table>
+	<name>set0</name>
+	<table>filter</table>
 	<family>ip6</family>
-	<set_flags>0</set_flags>
+	<flags>0</flags>
 	<key_type>0</key_type>
 	<key_len>0</key_len>
 	<data_type>0</data_type>
 	<data_len>0</data_len>
 	<set_elem>
-		<set_elem_flags>0</set_elem_flags>
-		<set_elem_key>
+		<flags>0</flags>
+		<key>
 			<data_reg type="value">
 				<len>16</len>
 				<data0>0xc09a002a</data0>
@@ -17,11 +17,11 @@
 				<data2>0x00000000</data2>
 				<data3>0x70010000</data3>
 			</data_reg>
-		</set_elem_key>
+		</key>
 	</set_elem>
 	<set_elem>
-		<set_elem_flags>0</set_elem_flags>
-		<set_elem_key>
+		<flags>0</flags>
+		<key>
 			<data_reg type="value">
 				<len>16</len>
 				<data0>0xc09a002a</data0>
@@ -29,7 +29,7 @@
 				<data2>0x00000000</data2>
 				<data3>0x50010000</data3>
 			</data_reg>
-		</set_elem_key>
+		</key>
 	</set_elem>
 </set>
 <!-- nft add rule ip6 filter test ip6 daddr { 2a00:9ac0:c1ca:27::150, 2a00:9ac0:c1ca:27::170, } counter accept -->
-- 
cgit v1.2.3