diff --git a/data/aut-num/AS4242423424 b/data/aut-num/AS4242421665
similarity index 82%
rename from data/aut-num/AS4242423424
rename to data/aut-num/AS4242421665
index 093daab64..95966cac5 100644
--- a/data/aut-num/AS4242423424
+++ b/data/aut-num/AS4242421665
@@ -1,4 +1,4 @@
-aut-num:            AS4242423424
+aut-num:            AS4242421665
 as-name:            AS-MAKURU-DN42
 admin-c:            MAKURU-DN42
 tech-c:             MAKURU-DN42
diff --git a/data/dns/makuru.dn42 b/data/dns/makuru.dn42
index c4bd4387f..8d31b2bbb 100644
--- a/data/dns/makuru.dn42
+++ b/data/dns/makuru.dn42
@@ -3,7 +3,7 @@ admin-c:            MAKURU-DN42
 tech-c:             MAKURU-DN42
 mnt-by:             MAKURU-MNT
 nserver:            ns1.makuru.dn42 172.20.175.128
-nserver:            ns1.makuru.dn42 fdc4:a95f:f73e::1
+nserver:            ns1.makuru.dn42 fd00:affe:affe::1
 nserver:            ns2.makuru.dn42 172.20.175.129
-nserver:            ns2.makuru.dn42 fdc4:a95f:f73e::2
+nserver:            ns2.makuru.dn42 fd00:affe:affe::2
 source:             DN42
diff --git a/data/inet6num/fdc4:a95f:f73e::_48 b/data/inet6num/fd00:affe:affe::_48
similarity index 69%
rename from data/inet6num/fdc4:a95f:f73e::_48
rename to data/inet6num/fd00:affe:affe::_48
index e8b9fba18..c61d2beb7 100644
--- a/data/inet6num/fdc4:a95f:f73e::_48
+++ b/data/inet6num/fd00:affe:affe::_48
@@ -1,5 +1,5 @@
-inet6num:           fdc4:a95f:f73e:0000:0000:0000:0000:0000 - fdc4:a95f:f73e:ffff:ffff:ffff:ffff:ffff
-cidr:               fdc4:a95f:f73e::/48
+inet6num:           fd00:affe:affe:0000:0000:0000:0000:0000 - fd00:affe:affe:ffff:ffff:ffff:ffff:ffff
+cidr:               fd00:affe:affe::/48
 netname:            MAKURU-NETWORK
 descr:              Network of MAKURU
 country:            DE
diff --git a/data/route/172.20.175.128_27 b/data/route/172.20.175.128_27
index 93572648d..9bb51938c 100644
--- a/data/route/172.20.175.128_27
+++ b/data/route/172.20.175.128_27
@@ -1,5 +1,5 @@
 route:              172.20.175.128/27
-origin:             AS4242423424
+origin:             AS4242421665
 max-length:         27
 mnt-by:             MAKURU-MNT
 source:             DN42
diff --git a/data/route6/fdc4:a95f:f73e::_48 b/data/route6/fd00:affe:affe::_48
similarity index 51%
rename from data/route6/fdc4:a95f:f73e::_48
rename to data/route6/fd00:affe:affe::_48
index a1484d30f..e69470cbe 100644
--- a/data/route6/fdc4:a95f:f73e::_48
+++ b/data/route6/fd00:affe:affe::_48
@@ -1,5 +1,5 @@
-route6:             fdc4:a95f:f73e::/48
-origin:             AS4242423424
+route6:             fd00:affe:affe::/48
+origin:             AS4242421665
 max-length:         48
 mnt-by:             MAKURU-MNT
 source:             DN42