1 files changed, 18 insertions, 5 deletions

diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
index f2af436..41428d0 100644
--- a/draft-schanzen-r5n.xml
+++ b/draft-schanzen-r5n.xml
@@ -217,6 +217,18 @@ Connectivity | |Underlay|  |Underlay|
          A node is participant in the network and addressable through the
          network overlay.
        </dd>
+       <dt>Node Address</dt>
+       <dd>
+         The <tt>Node Address</tt> is the identifier used on the Overlay
+         to address a node.
+       </dd>
+       <dt>Node ID</dt>
+       <dd>
+         The <tt>Node ID</tt> is the identity which is used to authenticate
+         a node in the underlay.
+         The <tt>Node Address</tt> is derived from
+         the <tt>Node ID</tt>.
+       </dd>
        <dt>Peer</dt>
        <dd>
          A peer is a node which is directly connected to our peer.
@@ -226,8 +238,9 @@ Connectivity | |Underlay|  |Underlay|
    <section anchor="overlay" numbered="true" toc="default">
      <name>Overlay</name>
      <t>
-       In the DHT overlay, a node is addressable by its <tt>NodeID</tt>.
-       The <tt>NodeID</tt> is a 512-bit hash of the <tt>NodeKey</tt>.
+       In the DHT overlay, a node is addressable by its
+       <tt>Node Address</tt>.
+       The <tt>Node Address</tt> is a 512-bit hash of the <tt>Node ID</tt>.
        <!-- FIXME should the node ID be agile? Should the signature then
        also be agile?-->
        <!--The node public key is the public key of the corresponding
@@ -1143,7 +1156,7 @@ END
            <artwork name="" type="" align="left" alt=""><![CDATA[
 0     8     16    24    32    40    48    56
 +-----+-----+-----+-----+-----+-----+-----+-----+
-|   TYPE    |   SIZE    |         NODEKEY       /
+|   TYPE    |   SIZE    |         NODEID        /
 +-----+-----+-----+-----+   (variable length)   /
 /                                               /
 +-----+-----+-----+-----+-----+-----+-----+-----+
@@ -1164,9 +1177,9 @@ END
              is the SIZE of the following fields NODEID and ADDRESSES in bytes.
              In network byte order.
            </dd>
-           <dt>NODEKEY</dt>
+           <dt>NODEID</dt>
            <dd>
-             is the NodeKey of the node which has generated this HELLO.
+             is the Node ID of the node which has generated this HELLO.
              The length content of this field is determined by the TYPE.
              Usually, this is a cryptographic public key which allows the
              Underlay to uniquely identify and authenticate the node.