diff --git a/data/aut-num/AS4242422439 b/data/aut-num/AS4242422439
index 16079136a..1a400ff43 100644
--- a/data/aut-num/AS4242422439
+++ b/data/aut-num/AS4242422439
@@ -2,5 +2,5 @@ aut-num:            AS4242422439
 as-name:            AS for DannyAAM
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/dns/saru.dn42 b/data/dns/saru.dn42
index df022ce26..80b68c264 100644
--- a/data/dns/saru.dn42
+++ b/data/dns/saru.dn42
@@ -2,7 +2,7 @@ domain:             saru.dn42
 descr:              DannyAAM's DN42 domain
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 nserver:            lb.ns.saru.dn42 172.20.239.193
 nserver:            lb.ns.saru.dn42 fd39:1c:2c1b:3939::3901
 nserver:            saru.ns.saru.dn42 172.20.239.198
diff --git a/data/inet6num/fd39:1c:2c1b::_48 b/data/inet6num/fd39:1c:2c1b::_48
index 2272a9227..97d79065e 100644
--- a/data/inet6num/fd39:1c:2c1b::_48
+++ b/data/inet6num/fd39:1c:2c1b::_48
@@ -3,7 +3,7 @@ cidr:               fd39:1c:2c1b::/48
 netname:            SARU-MOE
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 nserver:            lb.ns.saru.dn42
 nserver:            saru.ns.saru.dn42
 nserver:            hebi.ns.saru.dn42
diff --git a/data/inetnum/172.20.239.192_27 b/data/inetnum/172.20.239.192_27
index 56cd4f5ad..a7a96eded 100644
--- a/data/inetnum/172.20.239.192_27
+++ b/data/inetnum/172.20.239.192_27
@@ -3,7 +3,7 @@ cidr:               172.20.239.192/27
 netname:            SARU-MOE
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 nserver:            lb.ns.saru.dn42
 nserver:            saru.ns.saru.dn42
 nserver:            hebi.ns.saru.dn42
diff --git a/data/mntner/SARU-MOE-MNT b/data/mntner/SARU-MNT
similarity index 95%
rename from data/mntner/SARU-MOE-MNT
rename to data/mntner/SARU-MNT
index ce6bd7640..3af3caeed 100644
--- a/data/mntner/SARU-MOE-MNT
+++ b/data/mntner/SARU-MNT
@@ -1,4 +1,4 @@
-mntner:             SARU-MOE-MNT
+mntner:             SARU-MNT
 auth:               pgp-fingerprint AF3165DE7ABAD04F9250756E9147806CAF74BA71
 remarks:            ## most git commits signed with subkey below ##
 auth:               pgp-fingerprint 58C64BFA32613A034171C73351171AD7A66BDD51
@@ -9,5 +9,5 @@ remarks:            ## for ASIX ##
 remarks:            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCru/iumrZ/wNzwK73DKVnas1MCBi1u1DDc+U67bQrXO3o9A9N+6IYG3rQQXMhLNKlUKRhFnLx5iolREB2BhjKlfKNsmY369DZtWi1usnzj3SwKoBXI28OyFwPL9w+X9nqUuMpp26SL1Hj0ZOmy4iKviyDWE29oll6FwfyEkFKwlziDGzNlG9Mlz4BFP2Q5dts4YPJpHxGZddWwEUIPwganNNDYSX0s6EZaQK3VFoyxISuETTFY3pREDriLclDPC54FONmrrAM1rGI8DchK7rQeXEbyk/wNtnYygtEJQAPpU0ErknHNGeYdW/gWmmfjlY7lSI+42jjE1U6mdsU2RwrT DN42-ASIX
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/person/DANNYAAM-DN42 b/data/person/DANNYAAM-DN42
index 5bc4f265a..2a60facd6 100644
--- a/data/person/DANNYAAM-DN42
+++ b/data/person/DANNYAAM-DN42
@@ -1,5 +1,5 @@
 person:             DannyAAM
 contact:            danny@saru.moe
 nic-hdl:            DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/route/172.20.239.192_27 b/data/route/172.20.239.192_27
index 5de5c90c6..94f3ea660 100644
--- a/data/route/172.20.239.192_27
+++ b/data/route/172.20.239.192_27
@@ -2,5 +2,5 @@ route:              172.20.239.192/27
 origin:             AS4242422439
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/route6/fd39:1c:2c1b::_48 b/data/route6/fd39:1c:2c1b::_48
index 2833b59c1..cfc26c02e 100644
--- a/data/route6/fd39:1c:2c1b::_48
+++ b/data/route6/fd39:1c:2c1b::_48
@@ -2,5 +2,5 @@ route6:             fd39:1c:2c1b::/48
 origin:             AS4242422439
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42