diff --git a/data/as-set/AS-CCCHB b/data/as-set/AS-CCCHB
index d1d8fe437..2f4e8d7c7 100644
--- a/data/as-set/AS-CCCHB
+++ b/data/as-set/AS-CCCHB
@@ -3,19 +3,20 @@ descr:    CCCHB dn42 ASN block
 admin-c:  CREST-DN42
 admin-c:  CREST-DN42
 mnt-by:   CREST-MNT
-members:  64824
-members:  64825
-members:  64826
-members:  64827
-members:  64828
-members:  64829
-members:  64830
-members:  64831
-members:  64832
-members:  64833
-members:  64834
-members:  64835
-members:  64836
-members:  64837
-members:  64838
-members:  64839
+remarks:  as-block: 64824 - 64839
+x-members:  AS64824
+x-members:  AS64825
+x-members:  AS64826
+x-members:  AS64827
+x-members:  AS64828
+x-members:  AS64829
+x-members:  AS64830
+x-members:  AS64831
+x-members:  AS64832
+x-members:  AS64833
+x-members:  AS64834
+x-members:  AS64835
+x-members:  AS64836
+x-members:  AS64837
+x-members:  AS64838
+x-members:  AS64839
diff --git a/data/as-set/AS-MORTZU b/data/as-set/AS-MORTZU
index c9ce40d0d..8606f48b8 100644
--- a/data/as-set/AS-MORTZU
+++ b/data/as-set/AS-MORTZU
@@ -3,19 +3,19 @@ descr:    mortzu ASN block
 admin-c:  MORTZU-DN42
 mnt-by:   MORTZU-MNT
 remarks:  as-block: 64792 - 64807
-members:  AS64792
-members:  AS64793
-members:  AS64794
-members:  AS64795
-members:  AS64796
-members:  AS64797
-members:  AS64798
-members:  AS64799
-members:  AS64800
-members:  AS64801
-members:  AS64802
-members:  AS64803
-members:  AS64804
-members:  AS64805
-members:  AS64806
-members:  AS64807
+x-members:  AS64792
+x-members:  AS64793
+x-members:  AS64794
+x-members:  AS64795
+x-members:  AS64796
+x-members:  AS64797
+x-members:  AS64798
+x-members:  AS64799
+x-members:  AS64800
+x-members:  AS64801
+x-members:  AS64802
+x-members:  AS64803
+x-members:  AS64804
+x-members:  AS64805
+x-members:  AS64806
+x-members:  AS64807
diff --git a/data/as-set/AS-WINTIX b/data/as-set/AS-WINTIX
index 58636e823..fd7bec0a7 100644
--- a/data/as-set/AS-WINTIX
+++ b/data/as-set/AS-WINTIX
@@ -3,19 +3,19 @@ descr:    wintix
 admin-c:  WINTIX-DN42
 mnt-by:   DUMMY-MNT
 remarks:  as-block: 64808 - 64823
-members:  AS64808
-members:  AS64809
-members:  AS64810
-members:  AS64811
-members:  AS64812
-members:  AS64813
-members:  AS64814
-members:  AS64815
-members:  AS64816
-members:  AS64817
-members:  AS64818
-members:  AS64819
-members:  AS64820
-members:  AS64821
-members:  AS64822
-members:  AS64823
+x-members:  AS64808
+x-members:  AS64809
+x-members:  AS64810
+x-members:  AS64811
+x-members:  AS64812
+x-members:  AS64813
+x-members:  AS64814
+x-members:  AS64815
+x-members:  AS64816
+x-members:  AS64817
+x-members:  AS64818
+x-members:  AS64819
+x-members:  AS64820
+x-members:  AS64821
+x-members:  AS64822
+x-members:  AS64823
diff --git a/data/aut-num/AS64738 b/data/aut-num/AS64738
index 2f491a0ef..816161c3e 100644
--- a/data/aut-num/AS64738
+++ b/data/aut-num/AS64738
@@ -3,35 +3,35 @@ as-name:        WELTERDE-AS
 descr:          welterde's AS
 remarks:         ------< IPv6 downstream >---------------------------------------------
 remarks:         <<<<<<hex.fal2>>>>>> sigi via openvpn over VDSL
-mp-group:       id sigi-vdsl
+x-group:        id sigi-vdsl
                 node hex.fal2.welterde.net
                 afi ipv6.unicast
                 as AS64739
                 interface sigi.adq
                 local fdef:5d0d:ee12:3:1:2:fce3:36
                 remote fdef:5d0d:ee12:3:1:2:fce3:42
-mp-peer:        id _:sigi-vdsl
+x-peer:         id _:sigi-vdsl
                 ACTION in 64738:2012 community:append
                 ACCEPT SIGI-SIXXS-IP6NET
                 ANNOUNCE ANY
 remarks:         <<<<<<gandalf.fal1>>>>>> helios-eve
-mp-group:       id helios-eve
+x-group:        id helios-eve
                 node gandalf.fal1.welterde.net
                 as AS64794
                 interface helios.eve
                 ACTION in 64738:2013 community:append
                 ANNOUNCE ANY
                 ACCEPT ANY
-mp-peer:        id _:helios-eve
+x-peer:         id _:helios-eve
                 afi ipv6.unicast
                 local openvpn-helios-eve.tunnel.gandalf.fal1.welterde.net
                 remote fdef:5d0d:ee12:3:1:1:fd1a:42
-mp-peer:        id helios-eve-ip4:helios-eve
+x-peer:         id helios-eve-ip4:helios-eve
                 afi ipv4.unicast
                 local 172.22.255.0
                 remote 172.22.255.1
 remarks:         <<<<<<gandalf.fal1>>>>>> neoraider-chaos
-mp-group:       id neoraider-chaos
+x-group:        id neoraider-chaos
                 node gandalf.fal1.welterde.net
                 as AS64784
                 interface neoraider.chaos
@@ -40,13 +40,13 @@ mp-group:       id neoraider-chaos
                 ACTION in 64738:2013 community:append
                 ACCEPT ANY
                 ANNOUNCE ANY
-mp-peer:        id _:neoraider-chaos
+x-peer:         id _:neoraider-chaos
                 afi ipv6.unicast
-mp-peer:        id _:neoraider-chaos
+x-peer:         id _:neoraider-chaos
                 afi ipv4.unicast 
 remarks:         ------< tinc42 IX >---------------------------------------------------
 remarks:         ------[ common ]------------------------------------------------------
-mp-group:       id tinc42-ix
+x-group:        id tinc42-ix
                 node hex.fal2.welterde.net
                 interface tinc42
                 local tinc-tinc42.tunnel.hex.fal2.welterde.net