diff --git a/data/aut-num/AS4242421607 b/data/aut-num/AS4242421607
index 1d5b9d839..09dc4531a 100644
--- a/data/aut-num/AS4242421607
+++ b/data/aut-num/AS4242421607
@@ -1,6 +1,6 @@
 aut-num:            AS4242421607
-as-name:            AS for UNICORN Network
-admin-c:            UNICORN-DN42
-tech-c:             UNICORN-DN42
-mnt-by:             UNICORN-MNT
+as-name:            ATNET-AS4242421607
+admin-c:            ATNET-DN42
+tech-c:             ATNET-DN42
+mnt-by:             ATNET-MNT
 source:             DN42
diff --git a/data/inet6num/fd1d:cc09:1366::_48 b/data/inet6num/fd1d:cc09:1366::_48
index 92f5fcbfe..72423973a 100644
--- a/data/inet6num/fd1d:cc09:1366::_48
+++ b/data/inet6num/fd1d:cc09:1366::_48
@@ -1,10 +1,10 @@
 inet6num:           fd1d:cc09:1366:0000:0000:0000:0000:0000 - fd1d:cc09:1366:ffff:ffff:ffff:ffff:ffff
 cidr:               fd1d:cc09:1366::/48
-netname:            UNICORN-NETWORK
-descr:              Network of UNICORN
+netname:            ATNET-NETWORK
+descr:              ATNET's Netowrk
 country:            FR
-admin-c:            UNICORN-DN42
-tech-c:             UNICORN-DN42
-mnt-by:             UNICORN-MNT
+admin-c:            ATNET-DN42
+tech-c:             ATNET-DN42
+mnt-by:             ATNET-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.20.187.224_27 b/data/inetnum/172.20.187.224_27
index 45beda214..5594a698b 100644
--- a/data/inetnum/172.20.187.224_27
+++ b/data/inetnum/172.20.187.224_27
@@ -1,8 +1,8 @@
 inetnum:            172.20.187.224 - 172.20.187.255
 cidr:               172.20.187.224/27
-netname:            UNICORN-NETWORK
-admin-c:            UNICORN-DN42
-tech-c:             UNICORN-DN42
-mnt-by:             UNICORN-MNT
+netname:            ATNET-NETWORK
+admin-c:            ATNET-DN42
+tech-c:             ATNET-DN42
+mnt-by:             ATNET-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/mntner/ATNET-MNT b/data/mntner/ATNET-MNT
new file mode 100644
index 000000000..cb728700a
--- /dev/null
+++ b/data/mntner/ATNET-MNT
@@ -0,0 +1,6 @@
+mntner:             ATNET-MNT
+admin-c:            ATNET-DN42
+tech-c:             ATNET-DN42
+mnt-by:             ATNET-MNT
+auth:               pgp-fingerprint 6F877173618F32E46162788927854D448AC608E7
+source:             DN42
diff --git a/data/mntner/UNICORN-MNT b/data/mntner/UNICORN-MNT
deleted file mode 100644
index 56bf5111e..000000000
--- a/data/mntner/UNICORN-MNT
+++ /dev/null
@@ -1,6 +0,0 @@
-mntner:             UNICORN-MNT
-admin-c:            UNICORN-DN42
-tech-c:             UNICORN-DN42
-mnt-by:             UNICORN-MNT
-auth:               pgp-fingerprint 6300B9257CBF71F48874D520D51634831791296E
-source:             DN42
diff --git a/data/person/ATNET-DN42 b/data/person/ATNET-DN42
new file mode 100644
index 000000000..ba49ae46f
--- /dev/null
+++ b/data/person/ATNET-DN42
@@ -0,0 +1,6 @@
+person:             Antoine Thys
+e-mail:             contact@antoinethys.com
+pgp-fingerprint:    6F877173618F32E46162788927854D448AC608E7
+nic-hdl:            ATNET-DN42
+mnt-by:             ATNET-MNT
+source:             DN42
diff --git a/data/person/UNICORN-DN42 b/data/person/UNICORN-DN42
deleted file mode 100644
index f0f8e4980..000000000
--- a/data/person/UNICORN-DN42
+++ /dev/null
@@ -1,6 +0,0 @@
-person:             Antoine Thys
-e-mail:             contact@antoinethys.com
-pgp-fingerprint:    6300B9257CBF71F48874D520D51634831791296E
-nic-hdl:            UNICORN-DN42
-mnt-by:             UNICORN-MNT
-source:             DN42
diff --git a/data/route/172.20.187.224_27 b/data/route/172.20.187.224_27
index 91ab845ab..d11ec96b0 100644
--- a/data/route/172.20.187.224_27
+++ b/data/route/172.20.187.224_27
@@ -1,4 +1,4 @@
 route:              172.20.187.224/27
 origin:             AS4242421607
-mnt-by:             UNICORN-MNT
+mnt-by:             ATNET-MNT
 source:             DN42
diff --git a/data/route6/fd1d:cc09:1366::_48 b/data/route6/fd1d:cc09:1366::_48
index 56992dfb0..2f1c5134c 100644
--- a/data/route6/fd1d:cc09:1366::_48
+++ b/data/route6/fd1d:cc09:1366::_48
@@ -1,5 +1,5 @@
 route6:             fd1d:cc09:1366::/48
 origin:             AS4242421607
 max-length:         48
-mnt-by:             UNICORN-MNT
+mnt-by:             ATNET-MNT
 source:             DN42