diff --git a/data/aut-num/AS4242420529 b/data/aut-num/AS4242420529
index 98b00ca7d..b054f6229 100644
--- a/data/aut-num/AS4242420529
+++ b/data/aut-num/AS4242420529
@@ -1,6 +1,6 @@
 aut-num:            AS4242420529
-as-name:            DKJoker-AS
-admin-c:            DKJoker-DN42
-tech-c:             DKJoker-DN42
-mnt-by:             DKJoker-MNT
+as-name:            DKJOKER-AS
+admin-c:            DKJOKER-DN42
+tech-c:             DKJOKER-DN42
+mnt-by:             DKJOKER-MNT
 source:             DN42
diff --git a/data/inet6num/fdec:2fb6:2bdd:7965::_64 b/data/inet6num/fdec:2fb6:2bdd:7965::_64
index c50c27d07..48af9c9b2 100644
--- a/data/inet6num/fdec:2fb6:2bdd:7965::_64
+++ b/data/inet6num/fdec:2fb6:2bdd:7965::_64
@@ -1,9 +1,9 @@
 inet6num:           fdec:2fb6:2bdd:7965:0000:0000:0000:0000 - fdec:2fb6:2bdd:7965:ffff:ffff:ffff:ffff
 cidr:               fdec:2fb6:2bdd:7965::/64
-netname:            DKJoker-IPV6
-admin-c:            DKJoker-DN42
-tech-c:             DKJoker-DN42
-mnt-by:             DKJoker-MNT
+netname:            DKJOKER-IPV6
+admin-c:            DKJOKER-DN42
+tech-c:             DKJOKER-DN42
+mnt-by:             DKJOKER-MNT
 nserver:            ns1.dkjoker.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.23.231.64_27 b/data/inetnum/172.23.231.64_27
index 93979b68f..f800bc2e2 100644
--- a/data/inetnum/172.23.231.64_27
+++ b/data/inetnum/172.23.231.64_27
@@ -1,12 +1,12 @@
 inetnum:            172.23.231.64 - 172.23.231.95
 cidr:               172.23.231.64/27
-remarks:            Peer with me at DKJoker@pm.me
-netname:            DKJoker-DN42
-descr:              Peer with me at DKJoker@pm.me
+remarks:            Peer with me at DKJOKER@pm.me
+netname:            DKJOKER-DN42
+descr:              Peer with me at DKJOKER@pm.me
 country:            JP
 nserver:            ns1.dkjoker.dn42
-admin-c:            DKJoker-DN42
-tech-c:             DKJoker-DN42
-mnt-by:             DKJoker-MNT
+admin-c:            DKJOKER-DN42
+tech-c:             DKJOKER-DN42
+mnt-by:             DKJOKER-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/mntner/DKJOKER-MNT b/data/mntner/DKJOKER-MNT
new file mode 100644
index 000000000..2f9f58b57
--- /dev/null
+++ b/data/mntner/DKJOKER-MNT
@@ -0,0 +1,6 @@
+mntner:             DKJOKER-MNT
+descr:              DKJOKER
+admin-c:            DKJOKER-DN42
+tech-c:             DKJOKER-DN42
+mnt-by:             DKJOKER-MNT
+source:             DN42
diff --git a/data/person/DKJOKER-DN42 b/data/person/DKJOKER-DN42
new file mode 100644
index 000000000..955943009
--- /dev/null
+++ b/data/person/DKJOKER-DN42
@@ -0,0 +1,5 @@
+person:             DKJOKER-FNK
+contact:            DKJOKER@pm.me
+nic-hdl:            DKJOKER-DN42
+mnt-by:             DKJOKER-MNT
+source:             DN42
diff --git a/data/route/172.23.231.64_27 b/data/route/172.23.231.64_27
index c2dc97ac8..6e047ccb0 100644
--- a/data/route/172.23.231.64_27
+++ b/data/route/172.23.231.64_27
@@ -1,6 +1,6 @@
 route:              172.23.231.64/27
-descr:              DKJoker
-remarks:            DKJoker@pm.me
+descr:              DKJOKER
+remarks:            DKJOKER@pm.me
 origin:             AS4242420529
-mnt-by:             DKJoker-MNT
+mnt-by:             DKJOKER-MNT
 source:             DN42
diff --git a/data/route6/fdec:2fb6:2bdd:7965::_64 b/data/route6/fdec:2fb6:2bdd:7965::_64
index f7eea7d37..7028c584f 100644
--- a/data/route6/fdec:2fb6:2bdd:7965::_64
+++ b/data/route6/fdec:2fb6:2bdd:7965::_64
@@ -1,5 +1,5 @@
 route6:             fdec:2fb6:2bdd:7965::/64
 origin:             AS4242420529
 max-length:         64
-mnt-by:             DKJoker-MNT
+mnt-by:             DKJOKER-MNT
 source:             DN42