diff --git a/data/aut-num/AS4242421815 b/data/aut-num/AS4242421815
index 99b87bd9e..c4ae2485b 100644
--- a/data/aut-num/AS4242421815
+++ b/data/aut-num/AS4242421815
@@ -1,7 +1,7 @@
 aut-num:            AS4242421815
-as-name:            BOZHAN-AS
-descr:              Bozhan
-admin-c:            BOZHAN-DN42
-tech-c:             BOZHAN-DN42
-mnt-by:             BOZHAN-MNT
+as-name:            RIVENSBANE
+descr:              Rivensbane
+admin-c:            RIVENSBANE-DN42
+tech-c:             RIVENSBANE-DN42
+mnt-by:             RIVENSBANE-MNT
 source:             DN42
diff --git a/data/dns/as4242421815.dn42 b/data/dns/as4242421815.dn42
new file mode 100644
index 000000000..341127fde
--- /dev/null
+++ b/data/dns/as4242421815.dn42
@@ -0,0 +1,8 @@
+domain:             as4242421815.dn42
+admin-c:            RIVENSBANE-DN42
+tech-c:             RIVENSBANE-DN42
+mnt-by:             RIVENSBANE-MNT
+nserver:            ns1.as4242421815.dn42 172.21.85.67
+nserver:            ns1.as4242421815.dn42 fd6f:e34d:80de::3
+ds-rdata:           22145 15 2 0D469C6E6D2A624E6B3E410D6954F68F6744FD2D0EAC1A798108B651 EB3D7937
+source:             DN42
diff --git a/data/dns/rivensbane.dn42 b/data/dns/rivensbane.dn42
new file mode 100644
index 000000000..8ca104d13
--- /dev/null
+++ b/data/dns/rivensbane.dn42
@@ -0,0 +1,8 @@
+domain:             rivensbane.dn42
+admin-c:            RIVENSBANE-DN42
+tech-c:             RIVENSBANE-DN42
+mnt-by:             RIVENSBANE-MNT
+nserver:            ns1.rivensbane.dn42 172.21.85.67
+nserver:            ns1.rivensbane.dn42 fd6f:e34d:80de::3
+ds-rdata:           10645 15 2 FFFDEBB75B55EFA77C90AA681B8486138246C5EE3598F65149744A58 5B89CD63
+source:             DN42
diff --git a/data/inet6num/fd6f:e34d:80de::_48 b/data/inet6num/fd6f:e34d:80de::_48
index cd045b680..101f5c5a3 100644
--- a/data/inet6num/fd6f:e34d:80de::_48
+++ b/data/inet6num/fd6f:e34d:80de::_48
@@ -1,9 +1,11 @@
 inet6num:           fd6f:e34d:80de:0000:0000:0000:0000:0000 - fd6f:e34d:80de:ffff:ffff:ffff:ffff:ffff
-netname:            BOZHAN-IPV6
-country:            CN
-admin-c:            BOZHAN-DN42
-tech-c:             BOZHAN-DN42
-mnt-by:             BOZHAN-MNT
+netname:            RIVENSBANE-IPV6
+country:            NZ
+admin-c:            RIVENSBANE-DN42
+tech-c:             RIVENSBANE-DN42
+mnt-by:             RIVENSBANE-MNT
+nserver:            ns1.rivensbane.dn42
+ds-rdata:           47628 15 2 DDA31160A2AE4D3B32E74ABC7963FCAD321759306DB507090BEAC48B EBD75530
 status:             ASSIGNED
 cidr:               fd6f:e34d:80de::/48
 source:             DN42
diff --git a/data/inetnum/172.21.85.64_27 b/data/inetnum/172.21.85.64_27
index e8e60f762..399017bee 100644
--- a/data/inetnum/172.21.85.64_27
+++ b/data/inetnum/172.21.85.64_27
@@ -1,9 +1,11 @@
 inetnum:            172.21.85.64 - 172.21.85.95
-netname:            BOZHAN-IPV4
-country:            CN
-admin-c:            BOZHAN-DN42
-tech-c:             BOZHAN-DN42
-mnt-by:             BOZHAN-MNT
+netname:            RIVENSBANE-IPV4
+country:            NZ
+admin-c:            RIVENSBANE-DN42
+tech-c:             RIVENSBANE-DN42
+mnt-by:             RIVENSBANE-MNT
+nserver:            ns1.rivensbane.dn42
+ds-rdata:           24774 15 2 C73D8D54515C18C5123CA8B91D69E576093C4532C9316B1112C89086 983A0AD4
 status:             ASSIGNED
 cidr:               172.21.85.64/27
 source:             DN42
diff --git a/data/mntner/BOZHAN-MNT b/data/mntner/RIVENSBANE-MNT
similarity index 58%
rename from data/mntner/BOZHAN-MNT
rename to data/mntner/RIVENSBANE-MNT
index 59ecb218a..c79640f6b 100644
--- a/data/mntner/BOZHAN-MNT
+++ b/data/mntner/RIVENSBANE-MNT
@@ -1,7 +1,7 @@
-mntner:             BOZHAN-MNT
-admin-c:            BOZHAN-DN42
-tech-c:             BOZHAN-DN42
-mnt-by:             BOZHAN-MNT
+mntner:             RIVENSBANE-MNT
+admin-c:            RIVENSBANE-DN42
+tech-c:             RIVENSBANE-DN42
+mnt-by:             RIVENSBANE-MNT
 source:             DN42
 auth:               pgp-fingerprint CF4CDB6BC1F03E423BF55A747BEA2C264B859854
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJa33xx4xHIpsz+3d7yAHhhaft0NN9Wwuc71L6tkPIFO
diff --git a/data/person/BOZHAN-DN42 b/data/person/BOZHAN-DN42
deleted file mode 100644
index d2da3a7ea..000000000
--- a/data/person/BOZHAN-DN42
+++ /dev/null
@@ -1,5 +0,0 @@
-person:             Bozhan
-e-mail:             lbz@rivensbane.com
-nic-hdl:            BOZHAN-DN42
-mnt-by:             BOZHAN-MNT
-source:             DN42
diff --git a/data/person/RIVENSBANE-DN42 b/data/person/RIVENSBANE-DN42
new file mode 100644
index 000000000..0870226f7
--- /dev/null
+++ b/data/person/RIVENSBANE-DN42
@@ -0,0 +1,5 @@
+person:             Rivensbane
+e-mail:             lbz@rivensbane.com
+nic-hdl:            RIVENSBANE-DN42
+mnt-by:             RIVENSBANE-MNT
+source:             DN42
diff --git a/data/route/172.21.85.64_27 b/data/route/172.21.85.64_27
index d95698409..b1e9c33b5 100644
--- a/data/route/172.21.85.64_27
+++ b/data/route/172.21.85.64_27
@@ -1,4 +1,4 @@
 route:              172.21.85.64/27
 origin:             AS4242421815
-mnt-by:             BOZHAN-MNT
+mnt-by:             RIVENSBANE-MNT
 source:             DN42
diff --git a/data/route6/fd6f:e34d:80de::_48 b/data/route6/fd6f:e34d:80de::_48
index ce62ff011..f86004271 100644
--- a/data/route6/fd6f:e34d:80de::_48
+++ b/data/route6/fd6f:e34d:80de::_48
@@ -1,4 +1,4 @@
 route6:             fd6f:e34d:80de::/48
 origin:             AS4242421815
-mnt-by:             BOZHAN-MNT
+mnt-by:             RIVENSBANE-MNT
 source:             DN42