diff --git a/data/inet6num/fd0d:4cea:23:0:0:0:0:0_112 b/data/inet6num/fd0d:4cea:23::_112
similarity index 85%
rename from data/inet6num/fd0d:4cea:23:0:0:0:0:0_112
rename to data/inet6num/fd0d:4cea:23::_112
index 0cb1b4b25..74e5b46ec 100644
--- a/data/inet6num/fd0d:4cea:23:0:0:0:0:0_112
+++ b/data/inet6num/fd0d:4cea:23::_112
@@ -1,5 +1,5 @@
 inet6num:           fd0d:4cea:0023:0000:0000:0000:0000:0000 - fd0d:4cea:0023:0000:0000:0000:0000:ffff
-cidr:               fd0d:4cea:23:0:0:0:0:0/112
+cidr:               fd0d:4cea:23::/112
 netname:            CHAOSVPN-ARGV0X17
 status:             ASSIGNED
 remarks:            Imported from chaosvpn, do not edit!
diff --git a/data/inet6num/fd42:2950:0:ffff::_64 b/data/inet6num/fd42:295::ffff::_64
similarity index 91%
rename from data/inet6num/fd42:2950:0:ffff::_64
rename to data/inet6num/fd42:295::ffff::_64
index fae454547..81b69ea60 100644
--- a/data/inet6num/fd42:2950:0:ffff::_64
+++ b/data/inet6num/fd42:295::ffff::_64
@@ -7,5 +7,5 @@ tech-c:             CR-DN42
 mnt-by:             SIS-MNT
 org:                ORG-SIS
 status:             ASSIGNED
-cidr:               fd42:2950:0:ffff::/64
+cidr:               fd42:295::ffff::/64
 source:             DN42
diff --git a/data/inet6num/fd51:2bb2:fd0d:0:0:0:0:0_48 b/data/inet6num/fd51:2bb2:fd0d::_48
similarity index 85%
rename from data/inet6num/fd51:2bb2:fd0d:0:0:0:0:0_48
rename to data/inet6num/fd51:2bb2:fd0d::_48
index cf3588ad6..ecd847d70 100644
--- a/data/inet6num/fd51:2bb2:fd0d:0:0:0:0:0_48
+++ b/data/inet6num/fd51:2bb2:fd0d::_48
@@ -1,5 +1,5 @@
 inet6num:           fd51:2bb2:fd0d:0000:0000:0000:0000:0000 - fd51:2bb2:fd0d:ffff:ffff:ffff:ffff:ffff
-cidr:               fd51:2bb2:fd0d:0:0:0:0:0/48
+cidr:               fd51:2bb2:fd0d::/48
 netname:            CHAOSVPN-FFHH-SRV01
 status:             ASSIGNED
 remarks:            Imported from chaosvpn, do not edit!
diff --git a/data/inet6num/fd55:caa:bde3:0:0:0:0:0_64 b/data/inet6num/fd55:caa:bde3::_64
similarity index 85%
rename from data/inet6num/fd55:caa:bde3:0:0:0:0:0_64
rename to data/inet6num/fd55:caa:bde3::_64
index fc9a86385..4263182f4 100644
--- a/data/inet6num/fd55:caa:bde3:0:0:0:0:0_64
+++ b/data/inet6num/fd55:caa:bde3::_64
@@ -1,5 +1,5 @@
 inet6num:           fd55:0caa:bde3:0000:0000:0000:0000:0000 - fd55:0caa:bde3:0000:ffff:ffff:ffff:ffff
-cidr:               fd55:caa:bde3:0:0:0:0:0/64
+cidr:               fd55:caa:bde3::/64
 netname:            CHAOSVPN-BUZO
 status:             ASSIGNED
 remarks:            Imported from chaosvpn, do not edit!
diff --git a/data/inet6num/fd63:1e39:6f73:2929:0:0:0:0_64 b/data/inet6num/fd63:1e39:6f73:2929::_64
similarity index 84%
rename from data/inet6num/fd63:1e39:6f73:2929:0:0:0:0_64
rename to data/inet6num/fd63:1e39:6f73:2929::_64
index 11acfa2aa..92a1e4495 100644
--- a/data/inet6num/fd63:1e39:6f73:2929:0:0:0:0_64
+++ b/data/inet6num/fd63:1e39:6f73:2929::_64
@@ -1,5 +1,5 @@
 inet6num:           fd63:1e39:6f73:2929:0000:0000:0000:0000 - fd63:1e39:6f73:2929:ffff:ffff:ffff:ffff
-cidr:               fd63:1e39:6f73:2929:0:0:0:0/64
+cidr:               fd63:1e39:6f73:2929::/64
 netname:            CHAOSVPN-ARMITAGE
 status:             ASSIGNED
 remarks:            Imported from chaosvpn, do not edit!
diff --git a/data/route6/fd51:2bb2:fd0d:0:0:0:0:0_48 b/data/route6/fd51:2bb2:fd0d::_48
similarity index 85%
rename from data/route6/fd51:2bb2:fd0d:0:0:0:0:0_48
rename to data/route6/fd51:2bb2:fd0d::_48
index 0967749f9..fe72d4718 100644
--- a/data/route6/fd51:2bb2:fd0d:0:0:0:0:0_48
+++ b/data/route6/fd51:2bb2:fd0d::_48
@@ -1,4 +1,4 @@
-route6:             fd51:2bb2:fd0d:0:0:0:0:0/48
+route6:             fd51:2bb2:fd0d::/48
 max-length:         64
 origin:             AS64654
 origin:             AS4242422718
diff --git a/data/route6/fd55:caa:bde3:0:0:0:0:0_64 b/data/route6/fd55:caa:bde3::_64
similarity index 84%
rename from data/route6/fd55:caa:bde3:0:0:0:0:0_64
rename to data/route6/fd55:caa:bde3::_64
index df4bca2c0..19b782003 100644
--- a/data/route6/fd55:caa:bde3:0:0:0:0:0_64
+++ b/data/route6/fd55:caa:bde3::_64
@@ -1,4 +1,4 @@
-route6:             fd55:caa:bde3:0:0:0:0:0/64
+route6:             fd55:caa:bde3::/64
 max-length:         64
 origin:             AS64654
 origin:             AS4242422718
diff --git a/data/route6/fd63:1e39:6f73:2929:0:0:0:0_64 b/data/route6/fd63:1e39:6f73:2929::_64
similarity index 84%
rename from data/route6/fd63:1e39:6f73:2929:0:0:0:0_64
rename to data/route6/fd63:1e39:6f73:2929::_64
index 48ec61e8a..c64e8be67 100644
--- a/data/route6/fd63:1e39:6f73:2929:0:0:0:0_64
+++ b/data/route6/fd63:1e39:6f73:2929::_64
@@ -1,4 +1,4 @@
-route6:             fd63:1e39:6f73:2929:0:0:0:0/64
+route6:             fd63:1e39:6f73:2929::/64
 max-length:         64
 origin:             AS64654
 origin:             AS4242422718