diff --git a/data/aut-num/AS4242423925 b/data/aut-num/AS4242423925
index f708bfc30..982d2ea82 100644
--- a/data/aut-num/AS4242423925
+++ b/data/aut-num/AS4242423925
@@ -1,7 +1,7 @@
 aut-num:            AS4242423925
-as-name:            Rhine-AS
+as-name:            RHINE-AS
 descr:              A Rhine ASN
-admin-c:            Rhine-DN42
-tech-c:             Rhine-DN42
-mnt-by:             Rhine-MNT
+admin-c:            RHINE-DN42
+tech-c:             RHINE-DN42
+mnt-by:             RHINE-MNT
 source:             DN42
diff --git a/data/inetnum/172.23.50.0_26 b/data/inetnum/172.23.50.0_26
index 7232ecaaa..c1795b6f7 100644
--- a/data/inetnum/172.23.50.0_26
+++ b/data/inetnum/172.23.50.0_26
@@ -1,8 +1,8 @@
 inetnum:            172.23.50.0 - 172.23.50.63
 cidr:               172.23.50.0/26
-netname:            Rhine-NETWORK
-admin-c:            Rhine-DN42
-tech-c:             Rhine-DN42
-mnt-by:             Rhine-MNT
+netname:            RHINE-NETWORK
+admin-c:            RHINE-DN42
+tech-c:             RHINE-DN42
+mnt-by:             RHINE-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/mntner/Rhine-MNT b/data/mntner/Rhine-MNT
deleted file mode 100644
index d144508b0..000000000
--- a/data/mntner/Rhine-MNT
+++ /dev/null
@@ -1,7 +0,0 @@
-mntner:             Rhine-MNT
-descr:              A Rhine Network
-admin-c:            Rhine-DN42
-tech-c:             Rhine-DN42
-mnt-by:             Rhine-MNT
-source:             DN42
-auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnu4T2qMH2Qp4St8hAacmS0+4VzrqLCcZhqbVGP2dQn
diff --git a/data/person/Rhine-DN42 b/data/person/RHINE-DN42
similarity index 57%
rename from data/person/Rhine-DN42
rename to data/person/RHINE-DN42
index 71b0787ee..38a799a1d 100644
--- a/data/person/Rhine-DN42
+++ b/data/person/RHINE-DN42
@@ -1,5 +1,5 @@
 person:             Rhine
 contact:            noc@bgp.sk
-nic-hdl:            Rhine-DN42
-mnt-by:             Rhine-MNT
+nic-hdl:            RHINE-DN42
+mnt-by:             RHINE-MNT
 source:             DN42
diff --git a/data/route/172.23.50.0_26 b/data/route/172.23.50.0_26
index e84165a29..1f8118c68 100644
--- a/data/route/172.23.50.0_26
+++ b/data/route/172.23.50.0_26
@@ -1,4 +1,4 @@
 route:              172.23.50.0/26
 origin:             AS4242423925
-mnt-by:             Rhine-MNT
+mnt-by:             RHINE-MNT
 source:             DN42