diff --git a/data/aut-num/AS4242422624 b/data/aut-num/AS4242422624
index 01b9ac1d8..cd68aa72e 100644
--- a/data/aut-num/AS4242422624
+++ b/data/aut-num/AS4242422624
@@ -1,5 +1,6 @@
 aut-num:            AS4242422624
 as-name:            AS for FFRGB
+org:                ORG-FFRGB
 admin-c:            MEPHISTO-DN42
 tech-c:             MEPHISTO-DN42
 mnt-by:             FFRGB-MNT
diff --git a/data/inet6num/fd42:b60d:6174::_48 b/data/inet6num/fd42:b60d:6174::_48
index bc8b7b626..bbf609905 100644
--- a/data/inet6num/fd42:b60d:6174::_48
+++ b/data/inet6num/fd42:b60d:6174::_48
@@ -1,7 +1,8 @@
 inet6num:           fd42:b60d:6174:0000:0000:0000:0000:0000 - fd42:b60d:6174:ffff:ffff:ffff:ffff:ffff
 cidr:               fd42:b60d:6174::/48
-netname:            FFRGB-NETWORK
-descr:              Network of FFRGB
+org:                ORG-FFRGB
+netname:            FFRGB-TEST-NETWORK
+descr:              Testbed for FFRGB
 country:            DE
 admin-c:            MEPHISTO-DN42
 tech-c:             MEPHISTO-DN42
diff --git a/data/inetnum/172.23.207.0_24 b/data/inetnum/172.23.207.0_24
index eed27340c..7ba692349 100644
--- a/data/inetnum/172.23.207.0_24
+++ b/data/inetnum/172.23.207.0_24
@@ -1,6 +1,7 @@
 inetnum:            172.23.207.0 - 172.23.207.255
 cidr:               172.23.207.0/24
-netname:            FFRGB-NETWORK
+org:                ORG-FFRGB
+netname:            FFRGB-TEST-NETWORK
 admin-c:            MEPHISTO-DN42
 tech-c:             MEPHISTO-DN42
 mnt-by:             FFRGB-MNT