diff --git a/data/aut-num/AS4242423745 b/data/aut-num/AS4242423745
index 955a48a94..34c223a60 100644
--- a/data/aut-num/AS4242423745
+++ b/data/aut-num/AS4242423745
@@ -1,19 +1,14 @@
 aut-num:            AS4242423745
 as-name:            MUSKA-AS
-descr:              Contact email:xmcn@1l1.icu
+descr:              Muska Network
 remarks:            +------------------------------------+
-remarks:            |       Muska Ami Network            |
-remarks:            +------------------------------------+
-remarks:            | Looking Glass (IPv6 Only)          |
-remarks:            | https://looking-glass.dn42.1l1.icu |
+remarks:            |           Muska Network            |
 remarks:            +------------------------------------+
 remarks:            | Open for peering                   |
 remarks:            | More information:                  |
-remarks:            | https://blog.1l1.icu/extras/dn42   |
-remarks:            | Please contact me at:              |
-remarks:            | xmcn@1l1.icu                       |
+remarks:            | https://muska.zip                  |
 remarks:            +------------------------------------+
-admin-c:            MUSKA-DN42
-tech-c:             MUSKA-DN42
+admin-c:            MUSKA-AMI-DN42
+tech-c:             MUSKA-AMI-DN42
 mnt-by:             MUSKA-MNT
 source:             DN42
diff --git a/data/dns/muska.dn42 b/data/dns/muska.dn42
index 64509238d..4278f07e8 100644
--- a/data/dns/muska.dn42
+++ b/data/dns/muska.dn42
@@ -1,5 +1,5 @@
 domain:             muska.dn42
-tech-c:             MUSKA-DN42
+tech-c:             MUSKA-AMI-DN42
 mnt-by:             MUSKA-MNT
 nserver:            ns1.luochancy.dn42
 source:             DN42
diff --git a/data/inet6num/fdb5:32:ad4a::_48 b/data/inet6num/fdb5:32:ad4a::_48
index ce0c804f3..1ab8679f7 100644
--- a/data/inet6num/fdb5:32:ad4a::_48
+++ b/data/inet6num/fdb5:32:ad4a::_48
@@ -1,10 +1,10 @@
 inet6num:           fdb5:0032:ad4a:0000:0000:0000:0000:0000 - fdb5:0032:ad4a:ffff:ffff:ffff:ffff:ffff
 netname:            MUSKA-IPV6
-descr:              Muska Ami Network IPv6
+descr:              Muska Network IPv6
 remarks:            For more information, please see AS4242423745
 country:            HK
-admin-c:            MUSKA-DN42
-tech-c:             MUSKA-DN42
+admin-c:            MUSKA-AMI-DN42
+tech-c:             MUSKA-AMI-DN42
 mnt-by:             MUSKA-MNT
 status:             ASSIGNED
 cidr:               fdb5:32:ad4a::/48
diff --git a/data/inetnum/172.23.126.128_27 b/data/inetnum/172.23.126.128_27
index 9cf4b01d2..5bb9b9aaf 100644
--- a/data/inetnum/172.23.126.128_27
+++ b/data/inetnum/172.23.126.128_27
@@ -1,10 +1,10 @@
 inetnum:            172.23.126.128 - 172.23.126.159
 netname:            MUSKA-IPV4
-descr:              Muska Ami Network IPv4
+descr:              Muska Network IPv4
 remarks:            For more information, please see AS4242423745
 country:            HK
-admin-c:            MUSKA-DN42
-tech-c:             MUSKA-DN42
+admin-c:            MUSKA-AMI-DN42
+tech-c:             MUSKA-AMI-DN42
 mnt-by:             MUSKA-MNT
 status:             ASSIGNED
 cidr:               172.23.126.128/27
diff --git a/data/mntner/MUSKA-MNT b/data/mntner/MUSKA-MNT
index 0ec0a6d9d..ffca6a9ed 100644
--- a/data/mntner/MUSKA-MNT
+++ b/data/mntner/MUSKA-MNT
@@ -1,6 +1,6 @@
 mntner:             MUSKA-MNT
-admin-c:            MUSKA-DN42
-tech-c:             MUSKA-DN42
+admin-c:            MUSKA-AMI-DN42
+tech-c:             MUSKA-AMI-DN42
 mnt-by:             MUSKA-MNT
 source:             DN42
 auth:               pgp-fingerprint 335221E5DC90373604149C608C7736197D476704
diff --git a/data/person/MUSKA-AMI-DN42 b/data/person/MUSKA-AMI-DN42
new file mode 100644
index 000000000..daabaaff3
--- /dev/null
+++ b/data/person/MUSKA-AMI-DN42
@@ -0,0 +1,6 @@
+person:             Muska Ami
+www:                https://ami.muska.zip
+e-mail:             ami@muska.zip
+nic-hdl:            MUSKA-AMI-DN42
+mnt-by:             MUSKA-MNT
+source:             DN42
diff --git a/data/person/MUSKA-DN42 b/data/person/MUSKA-DN42
deleted file mode 100644
index bff15c112..000000000
--- a/data/person/MUSKA-DN42
+++ /dev/null
@@ -1,6 +0,0 @@
-person:             Muska_Ami
-www:                https://1l1.icu
-e-mail:             xmcn@1l1.icu
-nic-hdl:            MUSKA-DN42
-mnt-by:             MUSKA-MNT
-source:             DN42
diff --git a/data/route/172.23.126.128_27 b/data/route/172.23.126.128_27
index 9374ddf5a..6ff7f95c3 100644
--- a/data/route/172.23.126.128_27
+++ b/data/route/172.23.126.128_27
@@ -1,5 +1,5 @@
 route:              172.23.126.128/27
-descr:              Muska Ami Network Route IPv4
+descr:              Muska Network Route IPv4
 remarks:            For more information, please see AS4242423745
 origin:             AS4242423745
 mnt-by:             MUSKA-MNT
diff --git a/data/route6/fdb5:32:ad4a::_48 b/data/route6/fdb5:32:ad4a::_48
index bc0cb3e66..0e4e16303 100644
--- a/data/route6/fdb5:32:ad4a::_48
+++ b/data/route6/fdb5:32:ad4a::_48
@@ -1,5 +1,5 @@
 route6:             fdb5:32:ad4a::/48
-descr:              Muska Ami Network Route IPv6
+descr:              Muska Network Route IPv6
 remarks:            For more information, please see AS4242423745
 origin:             AS4242423745
 mnt-by:             MUSKA-MNT