merged

index.bs

@@ -493,7 +493,7 @@ authorizing an authenticator with which to complete the operation.
     The <dfn>publicKey</dfn> attribute contains the public key associated with the credential, represented as a
     CryptoKey object as defined in [[WebCryptoAPI#cryptokey-interface]].
 
-    The <dfn>attestation</dfn> attribute contains a key attestation statement returned by the authenticator. This provides
+    The <dfn>attestation</dfn> attribute contains an attestation statement returned by the authenticator. This provides
     information about the credential and the authenticator it is held in, such as the level of security assurance provided by
     the authenticator.
 </div>
@@ -582,7 +582,7 @@ authorizing an authenticator with which to complete the operation.
 </div>
 
 
-## WebAuthn Assertion (interface <dfn interface>WebAuthnAssertion</dfn>) ## {#iface-assertion}
+## <dfn interface>WebAuthnAssertion</dfn> Interface ## {#iface-assertion}
 
 <pre class="idl">
     interface WebAuthnAssertion {
@@ -650,14 +650,14 @@ If the caller wants to pass extensions to the platform, it SHOULD do so by addin
 with the extension identifier as the key, and the extension's value as the value (see [[#signature-format]] for details).
 
 
-## Credential Attestation Statement (interface <dfn interface>WebAuthnAttestation</dfn>) ## {#iface-attestation}
+## <dfn interface>WebAuthnAttestation</dfn> Interface ## {#iface-attestation}
 
 <pre class="idl">
     interface WebAuthnAttestation {
         readonly    attribute USVString     format;
         readonly    attribute ArrayBuffer   clientData;
         readonly    attribute ArrayBuffer   level2Data; // was authenticatorData
-        readonly    attribute any           level1Data;  // was statement
+        readonly    attribute any           level1Data; // was statement
     };
 </pre>
 
@@ -683,7 +683,7 @@ providing provenance information for the attesting key, enabling a trust decisio
 
 This attestation statement is delivered to the <a>[RP]</a> by the [RP]'s script running on the client, using methods outside
 the scope of this specification. It contains all the information that the [RP]'s server requires to validate the level1Data, as
-well as to decode and validate the bindings of both the client and authenticator data.
+well as to decode and validate the bindings of both the client and level2Data.
 
 
 ## Supporting Data Structures ## {#supporting-data-structures}
@@ -936,7 +936,7 @@ The goals of this design can be summarized as follows.
 - The design aims to reuse as much as possible of existing encoding formats in order to aid adoption and implementation.
 
 The contextual bindings are divided in two: Those added by the RP or the client platform, referred to as client data; and those
-added by the authenticator, referred to as the authenticator data. The client data must be signed over, but an authenticator is
+added by the authenticator, referred to as the level2Data. The client data must be signed over, but an authenticator is
 otherwise not interested in its contents. To save bandwidth and processing requirements on the authenticator, the client
 platform hashes the {{ClientData}} and sends only the result to the authenticator. The authenticator signs over the combination
 of this <a>clientDataHash</a>, and its own authenticator data.
@@ -989,7 +989,7 @@ The encoding of authenticator data is a byte array of 37 bytes or more, as follo
     <tr>
         <td>variable (if present)</td>
         <td>
-            Extension-defined authenticator data. This is a CBOR [[RFC7049]] map with extension identifiers as keys, and
+            Extension-defined level2Data. This is a CBOR [[RFC7049]] map with extension identifiers as keys, and
             extension authenticator data values as values. See [[#extensions]] for details.
         </td>
     </tr>
@@ -1090,7 +1090,7 @@ MUST return <a>clientDataJSON</a>, <a>level2Data</a> and the signature to the RP
 `clientData` and `level2Data` members respectively of the {{WebAuthnAssertion}} and {{WebAuthnAttestation}} structures.
 
 
-## Credential Attestation Statements ## {#cred-attestation-stmts}
+## Attestation Statements ## {#cred-attestation-stmts}
 
 An attestation statement is a specific type of signed data object, containing statements about a credential itself and the
 authenticator that created it. It is created using the process described in [[#signature-format]], with the important difference