diff --git a/data/aut-num/AS4242422092 b/data/aut-num/AS4242422092
index 3fc9f2b9a..f48d0a552 100644
--- a/data/aut-num/AS4242422092
+++ b/data/aut-num/AS4242422092
@@ -1,7 +1,7 @@
 aut-num:            AS4242422092
 as-name:            P3BK4C DN42 Network
-admin-c:            P3BK4C-DN42
-tech-c:             P3BK4C-DN42
+admin-c:            TOMKAP-DN42
+tech-c:             TOMKAP-DN42
 mnt-by:             P3BK4C-MNT
 remarks:            +--------------------------------------------+
 remarks:            |     ____ _____ ____  _  ___  _    ____     |
@@ -23,6 +23,6 @@ remarks:            |--------------------------------------------|
 remarks:            |           - Peering Locations -            |
 remarks:            |--------------------------------------------|
 remarks:            | Athens, GR / Amsterdam, NL / Paris, FR     |
-remarks:            | New York (NJ), USA /              more TBA |
+remarks:            | Vienna, AT / New York (NJ), USA            |
 remarks:            +--------------------------------------------+
 source:             DN42
diff --git a/data/dns/pebkac.dn42 b/data/dns/pebkac.dn42
index fd5a12d53..0ade349ce 100644
--- a/data/dns/pebkac.dn42
+++ b/data/dns/pebkac.dn42
@@ -1,6 +1,6 @@
 domain:             pebkac.dn42
-admin-c:            P3BK4C-DN42
-tech-c:             P3BK4C-DN42
+admin-c:            TOMKAP-DN42
+tech-c:             TOMKAP-DN42
 mnt-by:             P3BK4C-MNT
 nserver:            dns.pebkac.dn42 172.21.67.205
 nserver:            dns.pebkac.dn42 fd63:672f:38e7:53::1
diff --git a/data/inet6num/fd63:672f:38e7::_48 b/data/inet6num/fd63:672f:38e7::_48
index 495052fbf..ed55d8822 100644
--- a/data/inet6num/fd63:672f:38e7::_48
+++ b/data/inet6num/fd63:672f:38e7::_48
@@ -3,8 +3,8 @@ cidr:               fd63:672f:38e7::/48
 netname:            NET-P3BK4C-V6-000
 descr:              P3BK4C IPv6 Network
 country:            GR
-admin-c:            P3BK4C-DN42
-tech-c:             P3BK4C-DN42
+admin-c:            TOMKAP-DN42
+tech-c:             TOMKAP-DN42
 mnt-by:             P3BK4C-MNT
 nserver:            dns.pebkac.dn42
 status:             ASSIGNED
diff --git a/data/inetnum/172.21.67.192_27 b/data/inetnum/172.21.67.192_27
index 146c71c4f..f88da5545 100644
--- a/data/inetnum/172.21.67.192_27
+++ b/data/inetnum/172.21.67.192_27
@@ -1,9 +1,10 @@
 inetnum:            172.21.67.192 - 172.21.67.223
 cidr:               172.21.67.192/27
 netname:            NET-P3BK4C-000
+descr:              P3BK4C IPv4 Network
 country:            GR
-admin-c:            P3BK4C-DN42
-tech-c:             P3BK4C-DN42
+admin-c:            TOMKAP-DN42
+tech-c:             TOMKAP-DN42
 mnt-by:             P3BK4C-MNT
 nserver:            dns.pebkac.dn42
 status:             ASSIGNED
diff --git a/data/mntner/P3BK4C-MNT b/data/mntner/P3BK4C-MNT
index e64ab99ec..876309707 100644
--- a/data/mntner/P3BK4C-MNT
+++ b/data/mntner/P3BK4C-MNT
@@ -1,6 +1,6 @@
 mntner:             P3BK4C-MNT
-admin-c:            P3BK4C-DN42
-tech-c:             P3BK4C-DN42
+admin-c:            TOMKAP-DN42
+tech-c:             TOMKAP-DN42
 mnt-by:             P3BK4C-MNT
 remarks:            pin-sha256:hMxSUtSbk9hsA/2LheXucy13UxZzUNXawuoTCntP5pU=
 auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKttDqiStCOSGmTvuPSZOroIIYA2V847ssszqy9KoRCWu6H+IvKxnO9zEE9Tgzzga8ybyOJmFj1bBDTNS/Bu4fXSCUWPkb0i/85pQZkK1Rcz3pnyh7jwgveI1cIkItgwfOEM5kHjstE4XEm3oKNpK7wL8iXa+HHL6sh1xK5MPner2jJc7riKjdE90AdCMf9uEqT35IQQ78JB4ddkIyI/gYhYum7NiFmUFMS1zsfcjw8OfIgy2c5HiOWwjpKGcjQDk5rFUuNYfjhwQJ9JKOA2c7/0l1adg9izG8w3RVKuE/aM3uD/2vZ6eVRKecIZUffTyJEp16gvRtJ9izWNCGymeIdZXQdk5moIRHoiyeuWsCaassc4RzhpMt+dQNmnopkZ3v9FyG4T2Uc2h7AYLaaEH2iN0YgH3ACGuVjhUbY+PFYuEE7d6j+hnJmoGVcuI/lBlErTFzEKiZoU8v+S0KzhEgtrqW1vF25Js4GCj/YDrC0m+ein4Z9wcEU+3uv+rM3i7dDJg8NCHkVdrqqRJcUvccSC3OIfGsFUG/CDEgfrqYqS9TOCo0Fm7+kovwCze+ckk+mHhKdvSd6O5CirGMG1Z0swfkRiLrYkPTd8M6XLh6/8G5MTz2ZpQSqNtiv9Jn51l3WEX32SKCHg1L30QQPFBNyaba5GHBjNXwecvlzspd/Q==
diff --git a/data/person/P3BK4C-DN42 b/data/person/TOMKAP-DN42
similarity index 79%
rename from data/person/P3BK4C-DN42
rename to data/person/TOMKAP-DN42
index f30d91cdb..16e1be42b 100644
--- a/data/person/P3BK4C-DN42
+++ b/data/person/TOMKAP-DN42
@@ -1,5 +1,5 @@
 person:             Thomas K.
 contact:            dn42@pebkac.gr
-nic-hdl:            P3BK4C-DN42
+nic-hdl:            TOMKAP-DN42
 mnt-by:             P3BK4C-MNT
 source:             DN42