diff --git a/data/aut-num/AS4242421000 b/data/aut-num/AS4242421000
index 2bee1ffb8..58b56c9ba 100644
--- a/data/aut-num/AS4242421000
+++ b/data/aut-num/AS4242421000
@@ -6,7 +6,7 @@ remarks:            * gc = 00 -> Netherlands(Amsterdam)
 remarks:            * gc = 10 -> Switzerland(Zurich)
 remarks:            *
 remarks:            *************************************************
-admin-c:            TR-DN42
-tech-c:             TR-DN42
-mnt-by:             TR-MNT
+admin-c:            AKUHASHI-DN42
+tech-c:             AKUHASHI-DN42
+mnt-by:             AKUHASHI-MNT
 source:             DN42
diff --git a/data/aut-num/AS4242422045 b/data/aut-num/AS4242422045
index ad54ed3f9..30ae7e651 100644
--- a/data/aut-num/AS4242422045
+++ b/data/aut-num/AS4242422045
@@ -1,7 +1,7 @@
 aut-num:            AS4242422045
 as-name:            TR-NETWORK
 descr:              TR's AS
-admin-c:            TR-DN42
-tech-c:             TR-DN42
-mnt-by:             TR-MNT
+admin-c:            AKUHASHI-DN42
+tech-c:             AKUHASHI-DN42
+mnt-by:             AKUHASHI-MNT
 source:             DN42
diff --git a/data/dns/blackix.dn42 b/data/dns/blackix.dn42
index 8b52b0b59..1f3a2cea7 100644
--- a/data/dns/blackix.dn42
+++ b/data/dns/blackix.dn42
@@ -1,7 +1,8 @@
 domain:             blackix.dn42
 descr:              BlackIX
-admin-c:            TR-DN42
-tech-c:             TR-DN42
-mnt-by:             TR-MNT
+admin-c:            AKUHASHI-DN42
+tech-c:             AKUHASHI-DN42
+mnt-by:             AKUHASHI-MNT
 nserver:            ns1.blackix.dn42 fdf1:dde2:adde:1::53
+nserver:            ns2.blackix.dn42 fdf1:dde2:adde:2::53
 source:             DN42
diff --git a/data/inet6num/fd98:7309:e7cb::_48 b/data/inet6num/fd98:7309:e7cb::_48
index dd373fd31..689ada6df 100644
--- a/data/inet6num/fd98:7309:e7cb::_48
+++ b/data/inet6num/fd98:7309:e7cb::_48
@@ -3,8 +3,8 @@ cidr:               fd98:7309:e7cb::/48
 netname:            TR-NETWORK
 descr:              TR's network
 country:            CH
-admin-c:            TR-DN42
-tech-c:             TR-DN42
-mnt-by:             TR-MNT
+admin-c:            AKUHASHI-DN42
+tech-c:             AKUHASHI-DN42
+mnt-by:             AKUHASHI-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inet6num/fdf1:dde2:adde::_48 b/data/inet6num/fdf1:dde2:adde::_48
index a210627d4..fabaf4827 100644
--- a/data/inet6num/fdf1:dde2:adde::_48
+++ b/data/inet6num/fdf1:dde2:adde::_48
@@ -3,14 +3,17 @@ cidr:               fdf1:dde2:adde::/48
 netname:            BLACKIX
 descr:              BlackIX
 remarks:            ***************** Network range *****************
-remarks:            * fdf1:dde2:adde:ffff::/64 -> Backbone
-remarks:            * fdf1:dde2:adde:1::53     -> DNS
+remarks:            * fdf1:dde2:adde:f000::/52 -> Backbone
+remarks:            * fdf1:dde2:adde:1::53     -> DNS 1
+remarks:            * fdf1:dde2:adde:2::53     -> DNS 2
 remarks:            *
 remarks:            *************************************************
 country:            CH
-admin-c:            TR-DN42
-tech-c:             TR-DN42
-mnt-by:             TR-MNT
+country:            NL
+admin-c:            AKUHASHI-DN42
+tech-c:             AKUHASHI-DN42
+mnt-by:             AKUHASHI-MNT
 status:             ASSIGNED
 nserver:            ns1.blackix.dn42
+nserver:            ns2.blackix.dn42
 source:             DN42
diff --git a/data/mntner/TR-MNT b/data/mntner/AKUHASHI-MNT
similarity index 60%
rename from data/mntner/TR-MNT
rename to data/mntner/AKUHASHI-MNT
index db809d6f1..a649b4e80 100644
--- a/data/mntner/TR-MNT
+++ b/data/mntner/AKUHASHI-MNT
@@ -1,7 +1,7 @@
-mntner:             TR-MNT
-admin-c:            TR-DN42
-tech-c:             TR-DN42
-mnt-by:             TR-MNT
+mntner:             AKUHASHI-MNT
+admin-c:            AKUHASHI-DN42
+tech-c:             AKUHASHI-DN42
+mnt-by:             AKUHASHI-MNT
 source:             DN42
 auth:               pgp-fingerprint D195B1E8C9A56B485E19A9F83CAB54D5AEAD91EF
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINZRmCMnfQOkSud8YfA4A3rXkZj8bUvQnHQpQy6wcY7k
diff --git a/data/person/TR-DN42 b/data/person/AKUHASHI-DN42
similarity index 61%
rename from data/person/TR-DN42
rename to data/person/AKUHASHI-DN42
index cf43b8585..741c02763 100644
--- a/data/person/TR-DN42
+++ b/data/person/AKUHASHI-DN42
@@ -1,7 +1,7 @@
-person:             TR-DN42
+person:             AKUHASHI-DN42
 e-mail:             dn42@brief.li
 pgp-fingerprint:    D195B1E8C9A56B485E19A9F83CAB54D5AEAD91EF
 contact:            irc: akuhashi@hackint
-nic-hdl:            TR-DN42
-mnt-by:             TR-MNT
+nic-hdl:            AKUHASHI-DN42
+mnt-by:             AKUHASHI-MNT
 source:             DN42
diff --git a/data/route6/fd98:7309:e7cb::_48 b/data/route6/fd98:7309:e7cb::_48
index 9ee610c95..7d9085130 100644
--- a/data/route6/fd98:7309:e7cb::_48
+++ b/data/route6/fd98:7309:e7cb::_48
@@ -1,5 +1,5 @@
 route6:             fd98:7309:e7cb::/48
 origin:             AS4242422045
 max-length:         56
-mnt-by:             TR-MNT
+mnt-by:             AKUHASHI-MNT
 source:             DN42
diff --git a/data/route6/fdf1:dde2:adde::_48 b/data/route6/fdf1:dde2:adde::_48
index db9e3f8db..6c5b1f78f 100644
--- a/data/route6/fdf1:dde2:adde::_48
+++ b/data/route6/fdf1:dde2:adde::_48
@@ -1,5 +1,5 @@
 route6:             fdf1:dde2:adde::/48
 origin:             AS4242421000
 max-length:         48
-mnt-by:             TR-MNT
+mnt-by:             AKUHASHI-MNT
 source:             DN42