diff --git a/data/schema/DNS-SCHEMA b/data/schema/DNS-SCHEMA
index 5b61b1292..279e3b971 100644
--- a/data/schema/DNS-SCHEMA
+++ b/data/schema/DNS-SCHEMA
@@ -1,7 +1,7 @@
 schema:             DNS-SCHEMA
 ref:                dn42.domain
 key:                domain     required   single    primary schema
-key:                nserver    required   multiple  > [domain name] [ip addr]
+key:                nserver    required   multiple  > [domain-name] [ip-addr]
 key:                status     required   single    > {EVALPEND|CONNECT} [timestamp]
 key:                descr      optional   single
 key:                mnt-by     required   multiple  lookup=dn42.mntner
diff --git a/data/schema/INET6NUM-SCHEMA b/data/schema/INET6NUM-SCHEMA
index 95cfd95d0..732e8c538 100644
--- a/data/schema/INET6NUM-SCHEMA
+++ b/data/schema/INET6NUM-SCHEMA
@@ -3,7 +3,7 @@ ref:                dn42.inet6num
 key:                inet6num    required   single    schema
 key:                cidr        required   single    primary
 key:                netname     required   single
-key:                nserver     optional   multiple
+key:                nserver     optional   multiple  > [domain-name]
 key:                country     optional   multiple
 key:                descr       optional   single
 key:                status      optional   single    > {ALLOCATED|ASSIGNED} {PI|PA|}
diff --git a/data/schema/INETNUM-SCHEMA b/data/schema/INETNUM-SCHEMA
index aee68a37e..f2af9e9f6 100644
--- a/data/schema/INETNUM-SCHEMA
+++ b/data/schema/INETNUM-SCHEMA
@@ -3,7 +3,7 @@ ref:                dn42.inetnum
 key:                inetnum     required  single    schema
 key:                cidr        required  single    primary
 key:                netname     required  single
-key:                nserver     optional  multiple
+key:                nserver     optional  multiple  > [domain-name]
 key:                country     optional  multiple
 key:                descr       optional  single
 key:                status      optional  single    > {ALLOCATED|ASSIGNED} {PI|PA|}
diff --git a/data/schema/MNTNER-SCHEMA b/data/schema/MNTNER-SCHEMA
index 0b6df9030..68b23026a 100644
--- a/data/schema/MNTNER-SCHEMA
+++ b/data/schema/MNTNER-SCHEMA
@@ -8,7 +8,7 @@ key:                tech-c         optional  multiple  lookup=dn42.person,dn42.r
 key:                auth           optional  multiple  > [method] [value]...
 key:                org            optional  multiple  lookup=dn42.organisation
 key:                abuse-mailbox  optional  single
-key:                sha512-pw      optional  single
+key:                sha512-pw      deprecate single
 key:                remarks        optional  multiple
 key:                source         required  single    lookup=dn42.registry
 mnt-by:             DN42-MNT