diff --git a/data/aut-num/AS4242429689 b/data/aut-num/AS4242428981
similarity index 66%
rename from data/aut-num/AS4242429689
rename to data/aut-num/AS4242428981
index 13f19902f..a4fb257bd 100644
--- a/data/aut-num/AS4242429689
+++ b/data/aut-num/AS4242428981
@@ -1,5 +1,5 @@
-aut-num:            AS4242429689
-as-name:            Marshy Networks/AS4242429689
+aut-num:            4242428981
+as-name:            Marshy Networks/AS4242428981
 descr:              Marshy Networks's AS
 admin-c:            MARSHY-DN42
 tech-c:             MARSHY-DN42
diff --git a/data/dns/as4242428981.dn42 b/data/dns/as4242428981.dn42
new file mode 100644
index 000000000..4102f58c5
--- /dev/null
+++ b/data/dns/as4242428981.dn42
@@ -0,0 +1,10 @@
+domain:             as4242428981.dn42
+descr:              AS4242428981 Domain
+admin-c:            MARSHY-DN42
+tech-c:             MARSHY-DN42
+mnt-by:             MARSHY-MNT
+nserver:            ns1.as4242428981.dn42 172.23.158.208
+nserver:            ns1.as4242428981.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0100
+nserver:            ns2.as4242428981.dn42 172.23.158.209
+nserver:            ns2.as4242428981.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0200
+source:             DN42
diff --git a/data/dns/as4242429689.dn42 b/data/dns/as4242429689.dn42
deleted file mode 100644
index 5e0d267cf..000000000
--- a/data/dns/as4242429689.dn42
+++ /dev/null
@@ -1,10 +0,0 @@
-domain:             as4242429689.dn42
-descr:              AS4242429689 Domain
-admin-c:            MARSHY-DN42
-tech-c:             MARSHY-DN42
-mnt-by:             MARSHY-MNT
-nserver:            ns1.as4242429689.dn42 172.23.158.208
-nserver:            ns1.as4242429689.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0100
-nserver:            ns2.as4242429689.dn42 172.23.158.209
-nserver:            ns2.as4242429689.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0200
-source:             DN42
diff --git a/data/dns/marshy.dn42 b/data/dns/marshy.dn42
index 6f467b143..7d934edb2 100644
--- a/data/dns/marshy.dn42
+++ b/data/dns/marshy.dn42
@@ -3,8 +3,8 @@ descr:              Marshy' Domain
 admin-c:            MARSHY-DN42
 tech-c:             MARSHY-DN42
 mnt-by:             MARSHY-MNT
-nserver:            ns1.as4242429689.dn42 172.23.158.208
-nserver:            ns1.as4242429689.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0100
-nserver:            ns2.as4242429689.dn42 172.23.158.209
-nserver:            ns2.as4242429689.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0200
+nserver:            ns1.as4242428981.dn42 172.23.158.208
+nserver:            ns1.as4242428981.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0100
+nserver:            ns2.as4242428981.dn42 172.23.158.209
+nserver:            ns2.as4242428981.dn42 fdd7:7db4:6366:0000:0000:0000:0000:0200
 source:             DN42
diff --git a/data/organisation/ORG-MARSHY-NETWORKS b/data/organisation/ORG-MARSHY-NETWORKS
deleted file mode 100644
index cb397be73..000000000
--- a/data/organisation/ORG-MARSHY-NETWORKS
+++ /dev/null
@@ -1,7 +0,0 @@
-organisation:       ORG-MARSHY-NETWORKS
-org-name:           ORG-MARSHY-NETWORKS
-descr:              https://marshy.com.au/
-admin-c:            MARSHY-DN42
-tech-c:             MARSHY-DN42
-mnt-by:             MARSHY-MNT
-source:             DN42
diff --git a/data/route/172.23.158.192_26 b/data/route/172.23.158.192_26
index c0b2447f2..3d8993525 100644
--- a/data/route/172.23.158.192_26
+++ b/data/route/172.23.158.192_26
@@ -1,4 +1,4 @@
 route:              172.23.158.192/26
-origin:             AS4242429689
+origin:             AS4242428981
 mnt-by:             MARSHY-MNT
 source:             DN42
diff --git a/data/route6/fdd7:7db4:6366::_48 b/data/route6/fdd7:7db4:6366::_48
index 0098fda5d..e0c4abe9f 100644
--- a/data/route6/fdd7:7db4:6366::_48
+++ b/data/route6/fdd7:7db4:6366::_48
@@ -1,4 +1,4 @@
 route6:             fdd7:7db4:6366::/48
-origin:             AS4242429689
+origin:             AS4242428981
 mnt-by:             MARSHY-MNT
 source:             DN42