diff --git a/data/dns/bitpipe.dn42 b/data/dns/bitpipe.dn42
deleted file mode 100644
index 9090d672a..000000000
--- a/data/dns/bitpipe.dn42
+++ /dev/null
@@ -1,7 +0,0 @@
-domain:             bitpipe.dn42
-nserver:            ns1.bitpipe.dn42 172.20.135.34
-status:             OFFLINE
-admin-c:            IUS-DN42
-tech-c:             IUS-DN42
-mnt-by:             IUS-MNT
-source:             DN42
diff --git a/data/dns/lossy-network.dn42 b/data/dns/lossy-network.dn42
index 85970828d..aea005025 100644
--- a/data/dns/lossy-network.dn42
+++ b/data/dns/lossy-network.dn42
@@ -3,7 +3,7 @@ nserver:            ns1.lossy-network.dn42 172.23.42.1
 nserver:            ns1.lossy-network.dn42 fd42:23:42:b100::1
 nserver:            ns2.lossy-network.dn42 172.23.42.2
 nserver:            ns2.lossy-network.dn42 fd42:23:42:b200::1
-status:             ALIVEANDKICKING
+status:             CONNECT
 admin-c:            HEXA-DN42
 tech-c:             HEXA-DN42
 mnt-by:             HEXA-MNT
diff --git a/data/dns/ripnet.dn42 b/data/dns/ripnet.dn42
index 5b9d754c4..999bf4791 100644
--- a/data/dns/ripnet.dn42
+++ b/data/dns/ripnet.dn42
@@ -7,5 +7,5 @@ nserver:            nsa.ripnet.dn42 172.20.143.14
 nserver:            nsa.ripnet.dn42 fd42:6c6d:616f:2e72:6970::14
 nserver:            nsb.ripnet.dn42 172.20.143.13
 nserver:            nsb.ripnet.dn42 fd42:6c6d:616f:2e72:6970::13
-status:             PENDING
+status:             EVALPEND
 source:             DN42
diff --git a/data/dns/ucis.dn42 b/data/dns/ucis.dn42
index 34b1d4173..c56203976 100644
--- a/data/dns/ucis.dn42
+++ b/data/dns/ucis.dn42
@@ -2,7 +2,7 @@ domain:             ucis.dn42
 nserver:            ns1.ucis.dn42 172.22.166.2
 nserver:            ns3.ucis.dn42 172.22.166.6
 nserver:            ns1.ucis.nl
-status:             connect
+status:             CONNECT
 admin-c:            UFO-DN42
 tech-c:             UFO-DN42
 mnt-by:             DUMMY-MNT
diff --git a/data/dns/vbox.dn42 b/data/dns/vbox.dn42
deleted file mode 100644
index 730304b4a..000000000
--- a/data/dns/vbox.dn42
+++ /dev/null
@@ -1,8 +0,0 @@
-domain:             vbox.dn42
-admin-c:            VBOX-DN42
-tech-c:             VBOX-DN42
-mnt-by:             VBOX-MNT
-nserver:            ns1.vbox.dn42
-nserver:            ns2.vbox.dn42
-status:             OFFLINE
-source:             DN42
diff --git a/data/schema/DNS-SCHEMA b/data/schema/DNS-SCHEMA
index 54422959e..5b61b1292 100644
--- a/data/schema/DNS-SCHEMA
+++ b/data/schema/DNS-SCHEMA
@@ -2,7 +2,7 @@ schema:             DNS-SCHEMA
 ref:                dn42.domain
 key:                domain     required   single    primary schema
 key:                nserver    required   multiple  > [domain name] [ip addr]
-key:                status     required   single    > {EVALPEND,CONNECT} [timestamp]
+key:                status     required   single    > {EVALPEND|CONNECT} [timestamp]
 key:                descr      optional   single
 key:                mnt-by     required   multiple  lookup=dn42.mntner
 key:                admin-c    optional   multiple  lookup=dn42.person,dn42.role