diff --git a/data/aut-num/AS4242422558 b/data/aut-num/AS4242422558
index 4071b428b..72178da50 100644
--- a/data/aut-num/AS4242422558
+++ b/data/aut-num/AS4242422558
@@ -3,4 +3,5 @@ as-name:            COLBY-AS
 admin-c:            COLBY-DN42
 tech-c:             COLBY-DN42
 mnt-by:             COLBY-MNT
+descr:              dn42.derix.dev
 source:             DN42
diff --git a/data/dns/derix.dn42 b/data/dns/derix.dn42
index 519046edb..18cb59ab9 100644
--- a/data/dns/derix.dn42
+++ b/data/dns/derix.dn42
@@ -2,8 +2,6 @@ domain:             derix.dn42
 admin-c:            COLBY-DN42
 tech-c:             COLBY-DN42
 mnt-by:             COLBY-MNT
-nserver:            ns1.derix.dn42 172.23.120.17
-nserver:            ns1.derix.dn42 fd93:6001:6ed9::1
-nserver:            ns2.derix.dn42 172.23.120.18
-nserver:            ns2.derix.dn42 fd93:6001:6ed9::2
+nserver:            ns.derix.dn42 172.23.120.31
+nserver:            ns.derix.dn42 fd93:6001:6ed9:ffff::1
 source:             DN42
diff --git a/data/inet6num/fd93:6001:6ed9::_48 b/data/inet6num/fd93:6001:6ed9::_48
index 3ae5b28e5..e51d14724 100644
--- a/data/inet6num/fd93:6001:6ed9::_48
+++ b/data/inet6num/fd93:6001:6ed9::_48
@@ -1,12 +1,11 @@
 inet6num:           fd93:6001:6ed9:0000:0000:0000:0000:0000 - fd93:6001:6ed9:ffff:ffff:ffff:ffff:ffff
 cidr:               fd93:6001:6ed9::/48
-netname:            COLBY-V6NET
+netname:            COLBY-NET6
 descr:              Colby's IPv6 Network
 country:            AU
 admin-c:            COLBY-DN42
 tech-c:             COLBY-DN42
 mnt-by:             COLBY-MNT
 status:             ASSIGNED
-nserver:            ns1.derix.dn42
-nserver:            ns2.derix.dn42
+nserver:            ns.derix.dn42
 source:             DN42
diff --git a/data/inetnum/172.23.120.16_28 b/data/inetnum/172.23.120.16_28
index a3601cc37..87c7b2a8c 100644
--- a/data/inetnum/172.23.120.16_28
+++ b/data/inetnum/172.23.120.16_28
@@ -1,12 +1,11 @@
 inetnum:            172.23.120.16 - 172.23.120.31
 cidr:               172.23.120.16/28
-netname:            COLBY-NETWORK
+netname:            COLBY-NET
 descr:              Colby's IPv4 Network
 country:            AU
 admin-c:            COLBY-DN42
 tech-c:             COLBY-DN42
 mnt-by:             COLBY-MNT
 status:             ASSIGNED
-nserver:            ns1.derix.dn42
-nserver:            ns2.derix.dn42
+nserver:            ns.derix.dn42
 source:             DN42