diff --git a/data/aut-num/AS4242420351 b/data/aut-num/AS4242420351
index a1dfdc367..b11610285 100644
--- a/data/aut-num/AS4242420351
+++ b/data/aut-num/AS4242420351
@@ -6,3 +6,10 @@ tech-c:             MARIONIC-DN42
 org:                ORG-TEAM-MARIONIC
 mnt-by:             MARIONIC-MNT
 source:             DN42
+remarks:            --------------------------------------------
+remarks:            |        Team Marionic DN42 Testnet        |
+remarks:            |                                          |
+remarks:            |        Email: root@marionic.net          |
+remarks:            |                                          |
+remarks:            |        Website: (Coming soon...)         |
+remarks:            --------------------------------------------
diff --git a/data/dns/in.dn42 b/data/dns/in.dn42
new file mode 100644
index 000000000..293f043ae
--- /dev/null
+++ b/data/dns/in.dn42
@@ -0,0 +1,8 @@
+domain:             in.dn42
+admin-c:            MARIONIC-DN42
+tech-c:             MARIONIC-DN42
+nserver:            ns1.marionic.dn42
+nserver:            ns2.marionic.dn42
+nserver:            ns3.marionic.dn42
+mnt-by:             MARIONIC-MNT
+source:             DN42
diff --git a/data/dns/marionic.dn42 b/data/dns/marionic.dn42
new file mode 100644
index 000000000..57bac5689
--- /dev/null
+++ b/data/dns/marionic.dn42
@@ -0,0 +1,16 @@
+domain:             marionic.dn42
+admin-c:            MARIONIC-DN42
+tech-c:             MARIONIC-DN42
+nserver:            ns1.marionic.dn42 172.23.37.114
+nserver:            ns1.marionic.dn42 fd21:129:81d2:7253:114:114:ac17:2572
+nserver:            ns2.marionic.dn42 172.23.37.209
+nserver:            ns2.marionic.dn42 fd21:129:81d2:5053::723
+nserver:            ns3.marionic.dn42 172.23.37.97
+nserver:            ns3.marionic.dn42 fd21:129:81d2:0153::702
+remarks:            --------------------------------------------
+remarks:            |  NS1: ANYCAST SERVER.                    |
+remarks:            |  NS2 Location: Tokyo, Japan.             |
+remarks:            |  NS3 Location: Taiyuan, China.           |
+remarks:            --------------------------------------------
+mnt-by:             MARIONIC-MNT
+source:             DN42
diff --git a/data/dns/marionicnet.dn42 b/data/dns/marionicnet.dn42
deleted file mode 100644
index 740d062e1..000000000
--- a/data/dns/marionicnet.dn42
+++ /dev/null
@@ -1,13 +0,0 @@
-domain:             marionicnet.dn42
-admin-c:            MARIONIC-DN42
-tech-c:             MARIONIC-DN42
-org:                ORG-TEAM-MARIONIC
-nserver:            ns1.marionicnet.dn42 172.23.37.114
-nserver:            ns1.marionicnet.dn42 fd21:129:81d2:7253:114:114:ac17:2572
-nserver:            ns2.marionicnet.dn42 172.23.37.97
-nserver:            ns2.marionicnet.dn42 fd21:129:81d2:0153::702
-nserver:            ns3.marionicnet.dn42 172.23.37.209
-nserver:            ns3.marionicnet.dn42 fd21:129:81d2:5153::723
-descr:              NS1 will to be ANYCAST SERVER.
-mnt-by:             MARIONIC-MNT
-source:             DN42
diff --git a/data/inet6num/fd21:129:81d2::_48 b/data/inet6num/fd21:129:81d2::_48
index 47ef4b610..8f61570c0 100644
--- a/data/inet6num/fd21:129:81d2::_48
+++ b/data/inet6num/fd21:129:81d2::_48
@@ -8,7 +8,8 @@ country:            US
 admin-c:            MARIONIC-DN42
 tech-c:             MARIONIC-DN42
 mnt-by:             MARIONIC-MNT
-nserver:            ns1.marionicnet.dn42
-nserver:            ns2.marionicnet.dn42
+nserver:            ns1.marionic.dn42
+nserver:            ns2.marionic.dn42
+nserver:            ns3.marionic.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.23.37.192_27 b/data/inetnum/172.23.37.192_27
index 44f92c4f0..62cbc3dcc 100644
--- a/data/inetnum/172.23.37.192_27
+++ b/data/inetnum/172.23.37.192_27
@@ -2,13 +2,13 @@ inetnum:            172.23.37.192 - 172.23.37.223
 cidr:               172.23.37.192/27
 netname:            TEAM-MARIONIC-TESTNET-IP4
 descr:              Team Marionic IPv4 Global Testnet.
-country:            CN
 country:            JP
 country:            US
 admin-c:            MARIONIC-DN42
 tech-c:             MARIONIC-DN42
 mnt-by:             MARIONIC-MNT
-nserver:            ns1.marionicnet.dn42
-nserver:            ns2.marionicnet.dn42
+nserver:            ns1.marionic.dn42
+nserver:            ns2.marionic.dn42
+nserver:            ns3.marionic.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.23.37.96_27 b/data/inetnum/172.23.37.96_27
index ccfc59c2c..b5b4a7ed8 100644
--- a/data/inetnum/172.23.37.96_27
+++ b/data/inetnum/172.23.37.96_27
@@ -6,7 +6,8 @@ country:            CN
 admin-c:            MARIONIC-DN42
 tech-c:             MARIONIC-DN42
 mnt-by:             MARIONIC-MNT
-nserver:            ns1.marionicnet.dn42
-nserver:            ns2.marionicnet.dn42
+nserver:            ns1.marionic.dn42
+nserver:            ns2.marionic.dn42
+nserver:            ns3.marionic.dn42
 status:             ASSIGNED
 source:             DN42