diff --git a/data/aut-num/AS4242422990 b/data/aut-num/AS4242422995
similarity index 63%
rename from data/aut-num/AS4242422990
rename to data/aut-num/AS4242422995
index 6b0331687..fc607de30 100644
--- a/data/aut-num/AS4242422990
+++ b/data/aut-num/AS4242422995
@@ -1,5 +1,5 @@
-aut-num:            AS4242422990
-as-name:            AS for TAN
+aut-num:            AS4242422995
+as-name:            TAN-NET
 admin-c:            TAN-DN42
 tech-c:             TAN-DN42
 mnt-by:             TAN-MNT
diff --git a/data/inet6num/fd42:4242:2990::_48 b/data/inet6num/fd42:212:995::_48
similarity index 68%
rename from data/inet6num/fd42:4242:2990::_48
rename to data/inet6num/fd42:212:995::_48
index 17e5dc18e..46598f11e 100644
--- a/data/inet6num/fd42:4242:2990::_48
+++ b/data/inet6num/fd42:212:995::_48
@@ -1,5 +1,5 @@
-inet6num:           fd42:4242:2990:0000:0000:0000:0000:0000 - fd42:4242:2990:ffff:ffff:ffff:ffff:ffff
-cidr:               fd42:4242:2990::/48
+inet6num:           fd42:0212:0995:0000:0000:0000:0000:0000 - fd42:0212:0995:ffff:ffff:ffff:ffff:ffff
+cidr:               fd42:212:995::/48
 netname:            TAN-IPV6
 descr:              IPv6 Address Space for TAN
 country:            SG
diff --git a/data/organisation/ORG-TAN b/data/organisation/ORG-TAN
new file mode 100644
index 000000000..b9a2adc90
--- /dev/null
+++ b/data/organisation/ORG-TAN
@@ -0,0 +1,6 @@
+organisation:       ORG-TAN
+org-name:           TAN-NET
+admin-c:            TAN-DN42
+tech-c:             TAN-DN42
+mnt-by:             TAN-MNT
+source:             DN42
diff --git a/data/route/172.22.122.96_27 b/data/route/172.22.122.96_27
index fd47ba2e2..354c8a1e8 100644
--- a/data/route/172.22.122.96_27
+++ b/data/route/172.22.122.96_27
@@ -1,4 +1,4 @@
 route:              172.22.122.96/27
-origin:             AS4242422990
+origin:             AS4242422995
 mnt-by:             TAN-MNT
 source:             DN42
diff --git a/data/route6/fd42:4242:2990::_48 b/data/route6/fd42:212:995::_48
similarity index 51%
rename from data/route6/fd42:4242:2990::_48
rename to data/route6/fd42:212:995::_48
index a4e6b2d38..e4695002f 100644
--- a/data/route6/fd42:4242:2990::_48
+++ b/data/route6/fd42:212:995::_48
@@ -1,5 +1,5 @@
-route6:             fd42:4242:2990::/48
-origin:             AS4242422990
+route6:             fd42:212:995::/48
+origin:             AS4242422995
 max-length:         48
 mnt-by:             TAN-MNT
 source:             DN42