diff --git a/data/aut-num/AS4242423506 b/data/aut-num/AS4242423506
index ff4d78a23..a44742b5f 100644
--- a/data/aut-num/AS4242423506
+++ b/data/aut-num/AS4242423506
@@ -1,9 +1,7 @@
 aut-num:            AS4242423506
-as-name:            MRXERMON-AS
-descr:              MrXermon
-remarks:            peering requests: me@mrxermon.de
-remarks:            looking glass: https://lg.dn42.mrxermon.de
-admin-c:            MRXERMON-DN42
-tech-c:             MRXERMON-DN42
-mnt-by:             MRXERMON-MNT
+as-name:            NETAVIATOR-AS
+descr:              NETAVIATOR
+admin-c:            NETAVIATOR-DN42
+tech-c:             NETAVIATOR-DN42
+mnt-by:             NETAVIATOR-MNT
 source:             DN42
diff --git a/data/inet6num/fdb4:4911:ccf8::_48 b/data/inet6num/fdb4:4911:ccf8::_48
index 6d1867144..c3f4f2186 100644
--- a/data/inet6num/fdb4:4911:ccf8::_48
+++ b/data/inet6num/fdb4:4911:ccf8::_48
@@ -1,9 +1,9 @@
 inet6num:           fdb4:4911:ccf8:0000:0000:0000:0000:0000 - fdb4:4911:ccf8:ffff:ffff:ffff:ffff:ffff
 cidr:               fdb4:4911:ccf8::/48
-netname:            MRXERMON-NETWORK-v6-fdb4-4911-ccf8_48
+netname:            NETAVIATOR-NETWORK-v6-fdb4-4911-ccf8_48
 country:            DE
-admin-c:            MRXERMON-DN42
-tech-c:             MRXERMON-DN42
-mnt-by:             MRXERMON-MNT
+admin-c:            NETAVIATOR-DN42
+tech-c:             NETAVIATOR-DN42
+mnt-by:             NETAVIATOR-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.20.178.96_28 b/data/inetnum/172.20.178.96_28
index e7f103df6..a23c0e60c 100644
--- a/data/inetnum/172.20.178.96_28
+++ b/data/inetnum/172.20.178.96_28
@@ -1,9 +1,9 @@
 inetnum:            172.20.178.96 - 172.20.178.111
 cidr:               172.20.178.96/28
-netname:            MRXERMON-NETWORK-INTERNAL
+netname:            NETAVIATOR-NETWORK-INTERNAL
 country:            DE
-admin-c:            MRXERMON-DN42
-tech-c:             MRXERMON-DN42
-mnt-by:             MRXERMON-MNT
+admin-c:            NETAVIATOR-DN42
+tech-c:             NETAVIATOR-DN42
+mnt-by:             NETAVIATOR-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/mntner/MRXERMON-MNT b/data/mntner/NETAVIATOR-MNT
similarity index 85%
rename from data/mntner/MRXERMON-MNT
rename to data/mntner/NETAVIATOR-MNT
index 286a510ae..f09f2dbdc 100644
--- a/data/mntner/MRXERMON-MNT
+++ b/data/mntner/NETAVIATOR-MNT
@@ -1,7 +1,7 @@
-mntner:             MRXERMON-MNT
-admin-c:            MRXERMON-DN42
-tech-c:             MRXERMON-DN42
-mnt-by:             MRXERMON-MNT
+mntner:             NETAVIATOR-MNT
+admin-c:            NETAVIATOR-DN42
+tech-c:             NETAVIATOR-DN42
+mnt-by:             NETAVIATOR-MNT
 source:             DN42
 auth:               pgp-fingerprint 0EF24FDEC8474845D3F3DDF0976B78316D35EF65
 auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCoeCqSO03t9D1oS4JmpuWeJ3DQ5qKAGY+L9A+8hdW5G+bsikQ9sX9Rci4a+XRVX/SY4G93GhzsYTGpagb0+T0u2LzJFxuKSEQuFP1Iit0vxkMy/3ZhK+ZlfFqwpwty1Tj59/mhYHnx+c1tOcTQWdxWCZ5EuCrGmAgnpwHTZK9Rcj4V8fe1AjgL8sNllzYHGnA1+ZdihMzAdLPl0hwgpKT8kmWZFoL5iPQN6lNra8FDFVm7hBixcJfGEAgG9T2xj/8fdzu3HEZhBn4E7ifseyv1wde4QxwVug4k8l6gtQPirNeXiUR5bx412FIoouAvhpKxFDaiCDe5SaRhXgoJK6F10qtUNWou0/MhDr28n7BrxTjbPjMe6I4hxuO7zm4lCuN1xsv8RfBDgc4TRfS/2gRaxKBLNzOrGOSl/xtirSnI8hOQsQ4C/bWN87d0KhcBNIOSoFTu6ATKCgYyhFXgHFJZKYm8zxC9SDePlU5lozpQc4V+SaemKLMRVEnErtjhJTL5D+ZVFiU1whuIGayLY7TNFiURML3803J/dEwFKeEnDdn1SnGGANnBdlCGEo/Kbo/IKzO8JjnovVOty/wapHLudG43AQMZ2bEY0Ml4bnpOcr15Se3CTky3dLJIWi+aTREmka275RcU3JKvekSRwuBFJI4fHCG2N727LreADeqTDw==
diff --git a/data/person/MRXERMON-DN42 b/data/person/MRXERMON-DN42
deleted file mode 100644
index 15f1264a0..000000000
--- a/data/person/MRXERMON-DN42
+++ /dev/null
@@ -1,5 +0,0 @@
-person:             MrXermon
-contact:            jan@jangilla.de
-nic-hdl:            MRXERMON-DN42
-mnt-by:             MRXERMON-MNT
-source:             DN42
diff --git a/data/person/NETAVIATOR-DN42 b/data/person/NETAVIATOR-DN42
new file mode 100644
index 000000000..3d2e19df8
--- /dev/null
+++ b/data/person/NETAVIATOR-DN42
@@ -0,0 +1,5 @@
+person:             netaviator
+contact:            jan@jangilla.de
+nic-hdl:            NETAVIATOR-DN42
+mnt-by:             NETAVIATOR-MNT
+source:             DN42
diff --git a/data/route/172.20.178.96_28 b/data/route/172.20.178.96_28
index e46a45e89..3b05010af 100644
--- a/data/route/172.20.178.96_28
+++ b/data/route/172.20.178.96_28
@@ -1,4 +1,4 @@
 route:              172.20.178.96/28
 origin:             AS4242423506
-mnt-by:             MRXERMON-MNT
+mnt-by:             NETAVIATOR-MNT
 source:             DN42
diff --git a/data/route6/fdb4:4911:ccf8::_48 b/data/route6/fdb4:4911:ccf8::_48
index 86688f503..cc8c6e138 100644
--- a/data/route6/fdb4:4911:ccf8::_48
+++ b/data/route6/fdb4:4911:ccf8::_48
@@ -1,4 +1,4 @@
 route6:             fdb4:4911:ccf8::/48
 origin:             AS4242423506
-mnt-by:             MRXERMON-MNT
+mnt-by:             NETAVIATOR-MNT
 source:             DN42