diff --git a/data/aut-num/AS4242423724 b/data/aut-num/AS4242423724
index 2ed8745e2..b297d3056 100644
--- a/data/aut-num/AS4242423724
+++ b/data/aut-num/AS4242423724
@@ -1,5 +1,5 @@
 aut-num:            AS4242423724
-as-name:            Hinata Network
+as-name:            Hinata-Network
 admin-c:            HINATAKATO-DN42
 tech-c:             HINATAKATO-DN42
 mnt-by:             HINATAKATO-MNT
diff --git a/data/inet6num/fdb8:946a:bc01::_48 b/data/inet6num/fdb8:946a:bc01::_48
index 4fccc0a7a..dd4e22856 100644
--- a/data/inet6num/fdb8:946a:bc01::_48
+++ b/data/inet6num/fdb8:946a:bc01::_48
@@ -1,5 +1,5 @@
 inet6num:           fdb8:946a:bc01:0000:0000:0000:0000:0000 - fdb8:946a:bc01:ffff:ffff:ffff:ffff:ffff
-netname:            HINATAKATO-IPV6
+netname:            Hinata-Network
 country:            CN
 admin-c:            HINATAKATO-DN42
 tech-c:             HINATAKATO-DN42
diff --git a/data/inetnum/172.22.162.64_27 b/data/inetnum/172.22.162.64_27
index cfac7fde9..72ad4958e 100644
--- a/data/inetnum/172.22.162.64_27
+++ b/data/inetnum/172.22.162.64_27
@@ -1,5 +1,5 @@
 inetnum:            172.22.162.64 - 172.22.162.95
-netname:            HINATAKATO-IPV4
+netname:            Hinata-Network
 country:            CN
 admin-c:            HINATAKATO-DN42
 tech-c:             HINATAKATO-DN42
diff --git a/data/inetnum/172.23.215.224_27 b/data/inetnum/172.23.215.224_27
index 182d620bc..fd5c75d02 100644
--- a/data/inetnum/172.23.215.224_27
+++ b/data/inetnum/172.23.215.224_27
@@ -1,5 +1,5 @@
 inetnum:            172.23.215.224 - 172.23.215.255
-netname:            HINATAKATO-IPV4
+netname:            Hinata-Network
 country:            CN
 admin-c:            HINATAKATO-DN42
 tech-c:             HINATAKATO-DN42
diff --git a/data/person/HINATAKATO-DN42 b/data/person/HINATAKATO-DN42
index a49aaf2ed..a195192a4 100644
--- a/data/person/HINATAKATO-DN42
+++ b/data/person/HINATAKATO-DN42
@@ -1,5 +1,5 @@
 person:             Hinata Kato
-contact:            hinatakato@outlook.com
+e-mail:             hinatakato@outlook.com
 nic-hdl:            HINATAKATO-DN42
 mnt-by:             HINATAKATO-MNT
 source:             DN42