diff --git a/data/aut-num/AS4242421411 b/data/aut-num/AS4242421411
index ada0a415a..f3913e249 100644
--- a/data/aut-num/AS4242421411
+++ b/data/aut-num/AS4242421411
@@ -1,5 +1,5 @@
 aut-num:            AS4242421411
-as-name:            AS-C4TG1RL5-DN42
+as-name:            C4TG1RL5
 admin-c:            C4TG1RL5-DN42
 tech-c:             C4TG1RL5-DN42
 mnt-by:             C4TG1RL5-MNT
diff --git a/data/dns/catgirls.dn42 b/data/dns/catgirls.dn42
index 14d5223bf..b9cfdaaee 100644
--- a/data/dns/catgirls.dn42
+++ b/data/dns/catgirls.dn42
@@ -3,6 +3,6 @@ admin-c:            C4TG1RL5-DN42
 tech-c:             C4TG1RL5-DN42
 mnt-by:             C4TG1RL5-MNT
 org:                ORG-C4TG1RL5
-nserver:            ns1.catgirls.dn42 172.23.196.52
-nserver:            ns1.catgirls.dn42 fd42:deca:fbad::f1:c47:ff
+nserver:            ns1.catgirls.dn42 172.23.196.62
+nserver:            ns1.catgirls.dn42 fd42:deca:fbad:ffff::1
 source:             DN42
diff --git a/data/dns/myip.dn42 b/data/dns/myip.dn42
index d16459235..fb3a72a9e 100644
--- a/data/dns/myip.dn42
+++ b/data/dns/myip.dn42
@@ -10,6 +10,7 @@ nserver:            ns.highdef.dn42
 mnt-by:             MARK22K-MNT
 nserver:            ns1.bandura.dn42
 mnt-by:             C4TG1RL5-MNT
+nserver:            ns1.catgirls.dn42
 mnt-by:             CHARLIE-MNT
 nserver:            ns1.charlie.dn42
 source:             DN42
diff --git a/data/inet6num/fd42:d42:d42:81::_64 b/data/inet6num/fd42:d42:d42:81::_64
index 65c034407..6a0329f22 100644
--- a/data/inet6num/fd42:d42:d42:81::_64
+++ b/data/inet6num/fd42:d42:d42:81::_64
@@ -10,6 +10,7 @@ mnt-by:             MARK22K-MNT
 nserver:            ns1.bandura.dn42
 mnt-by:             JLU5-MNT
 mnt-by:             C4TG1RL5-MNT
+nserver:            ns1.catgirls.dn42
 mnt-by:             CHARLIE-MNT
 nserver:            ns1.charlie.dn42
 status:             ASSIGNED
diff --git a/data/inet6num/fd42:deca:fbad::_48 b/data/inet6num/fd42:deca:fbad::_48
index b8f4e5a5f..1f5c1b35f 100644
--- a/data/inet6num/fd42:deca:fbad::_48
+++ b/data/inet6num/fd42:deca:fbad::_48
@@ -1,10 +1,6 @@
 inet6num:           fd42:deca:fbad:0000:0000:0000:0000:0000 - fd42:deca:fbad:ffff:ffff:ffff:ffff:ffff
 cidr:               fd42:deca:fbad::/48
-netname:            C4TG1RL5-NETWORK
-descr:              Catgirls! - DECAF BAD
-country:            DE
-country:            PL
-country:            US
+netname:            C4TG1RL5
 admin-c:            C4TG1RL5-DN42
 tech-c:             C4TG1RL5-DN42
 mnt-by:             C4TG1RL5-MNT
diff --git a/data/inetnum/172.20.0.81_32 b/data/inetnum/172.20.0.81_32
index f5f220ea3..49d341ff5 100644
--- a/data/inetnum/172.20.0.81_32
+++ b/data/inetnum/172.20.0.81_32
@@ -10,6 +10,7 @@ mnt-by:             MARK22K-MNT
 nserver:            ns1.bandura.dn42
 mnt-by:             JLU5-MNT
 mnt-by:             C4TG1RL5-MNT
+nserver:            ns1.catgirls.dn42
 mnt-by:             CHARLIE-MNT
 nserver:            ns1.charlie.dn42
 status:             ASSIGNED
diff --git a/data/inetnum/172.23.196.32_27 b/data/inetnum/172.23.196.32_27
index d5802a28c..7c7e82c2b 100644
--- a/data/inetnum/172.23.196.32_27
+++ b/data/inetnum/172.23.196.32_27
@@ -1,10 +1,6 @@
 inetnum:            172.23.196.32 - 172.23.196.63
 cidr:               172.23.196.32/27
-netname:            C4TG1RL5-NETWORK-IPV4
-descr:              Catgirls - legacy net
-country:            DE
-country:            PL
-country:            US
+netname:            C4TG1RL5
 admin-c:            C4TG1RL5-DN42
 tech-c:             C4TG1RL5-DN42
 mnt-by:             C4TG1RL5-MNT
diff --git a/data/organisation/ORG-C4TG1RL5 b/data/organisation/ORG-C4TG1RL5
index 522011232..29cd80e6f 100644
--- a/data/organisation/ORG-C4TG1RL5
+++ b/data/organisation/ORG-C4TG1RL5
@@ -1,5 +1,5 @@
 organisation:       ORG-C4TG1RL5
-org-name:           C4TG1RL5_UN1T3D
+org-name:           C4TG1RL5
 admin-c:            C4TG1RL5-DN42
 tech-c:             C4TG1RL5-DN42
 mnt-by:             C4TG1RL5-MNT