1 files changed, 12 insertions, 9 deletions

diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
index 59372fb..518cd03 100644
--- a/draft-schanzen-gns.xml
+++ b/draft-schanzen-gns.xml
@@ -315,7 +315,7 @@
        <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|       ZONE TYPE       |      PUBLIC ZONE KEY  /
+|       ZONE TYPE       |      ZONE PUBLIC KEY  /
 +-----+-----+-----+-----+                       /
 /                                               /
 /                                               /
@@ -465,7 +465,7 @@ zTLD := zkl[126:129].zkl[63:125].zkl[0:62]
 +-----------------------------------------------+
 |                   TIMESTAMP                   |
 +-----------------------------------------------+
-|       ZONE TYPE       |    PUBLIC ZONE KEY    |
+|       ZONE TYPE       |    ZONE PUBLIC KEY    |
 +-----+-----+-----+-----+                       |
 /                                               /
 /                                               /
@@ -484,11 +484,14 @@ zTLD := zkl[126:129].zkl[63:125].zkl[0:62]
            In microseconds since midnight (0 hour), January 1, 1970 in network
            byte order.
          </dd>
-         <dt>PUBLIC KEY</dt>
+         <dt>ZONE TYPE</dt>
+         <dd>
+           is the 32-bit zone type.
+         </dd>
+         <dt>ZONE PUBLIC KEY</dt>
          <dd>
-           is the 256-bit public key zk of the zone which is being revoked and
-           the key to be used to verify SIGNATURE. The
-           wire format of this value is defined in <xref target="RFC8032" />,
+           is the 256-bit public key zk of the zone which is being revoked.
+           The wire format of this value is defined in <xref target="RFC8032" />,
            Section 5.1.5.
          </dd>
        </dl>
@@ -538,7 +541,7 @@ zTLD := zkl[126:129].zkl[63:125].zkl[0:62]
 +-----+-----+-----+-----+-----+-----+-----+-----+
 |                     POW_Z-1                   |
 +-----------------------------------------------+
-|       ZONE TYPE       |    PUBLIC ZONE KEY    |
+|       ZONE TYPE       |    ZONE PUBLIC KEY    |
 +-----+-----+-----+-----+                       |
 /                                               /
 /                                               /
@@ -1475,7 +1478,7 @@ q := SHA512 (HDKD-Public(zk, label))
          <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|       ZONE TYPE       |    PUBLIC ZONE KEY    |
+|       ZONE TYPE       |    ZONE PUBLIC KEY    |
 +-----+-----+-----+-----+       (BLINDED)       |
 /                                               /
 /                                               /
@@ -1510,7 +1513,7 @@ q := SHA512 (HDKD-Public(zk, label))
          <dt>SIGNATURE</dt>
          <dd>
            The signature is computed over the data following
-           the PUBLIC KEY field.
+           this field.
            The signature is created using the Sign() function of
            the cryptosystem of the zone and the derived private key
            "ZKDF-Private(d, label)" (see <xref target="ztype" />).