Tweak wording and naming of CBOR fields

index.bs

@@ -1380,20 +1380,19 @@ This section specifies the algorithm for generating an <a>attestation object</a>
 In order to construct an <a>attestation object</a> for a given credential using a particular <a>attestation statement
 format</a>, the authenticator MUST first generate an <a>authenticatorData</a> structure,
 
-The authenticator MUST then concatenate this <a>authenticatorData</a> and the client-supplied <a>clientDataHash</a> as specified
-in [[#authenticator-signature]] to form <dfn>attToBeSigned</dfn>. It must then run the signing procedure for the desired
-attestation statement format with <a>attToBeSigned</a> as input, and use this to construct an attestation statement in that
-attestation statement format.
+The authenticator MUST then run the signing procedure for the desired attestation statement format with this
+<a>authenticatorData</a> and the client-supplied <a>clientDataHash</a> as input, and use this to construct an attestation
+statement in that attestation statement format.
 
 Finally, the authenticator MUST construct the <a>attestation object</a> as a CBOR map comprising the following fields:
 
-: format
+: fmt
 :: The <a>attestation format identifier</a> associated with the attestation statement.
 
-: authenticatorData
+: authData
 :: The authenticator data used to generate the attestation statement.
 
-: attestation
+: attStmt
 :: The attestation statement constructed above.
 
 
@@ -1589,7 +1588,7 @@ this format can even be implemented by <a>authenticators</a> with very limited r
         3. "PS256", "PS384" and "PS512" [[!RFC7518]]
         4. "ED256" and "ED512" [[!FIDOEcdaaAlgorithm]]
 
-    : signature
+    : sig
     :: A byte string containing the attestation signature.
 
     : x5c
@@ -1681,7 +1680,7 @@ engine.
 : Syntax
 :: A TPM Attestation statement is a CBOR map with the following fields:
 
-    : tpmVersion
+    : ver
     :: A text string containing the version of the TPM specification to which the signature conforms. Currently the only
         supported version is "2.0".
 
@@ -1699,15 +1698,15 @@ engine.
         4. "ED256" [[!FIDOEcdaaAlgorithm]]
         5. "ED512" [[!FIDOEcdaaAlgorithm]]
 
-    : signature
+    : sig
     :: A byte string containing the attestation signature, in the form of a TPMT_SIGNATURE structure as specified in
         [[TPMv2-Part2]] section 11.3.4.
 
-    : certifyInfo
+    : certInfo
     :: A byte string containing the structure over which the attestation signature was computed. This is a TPMS_ATTEST structure
         as specified in [[TPMv2-Part2]] section 10.12.8.
 
-    : publicArea
+    : pubArea
     :: The TPMT_PUBLIC structure (see [[TPMv2-Part2]] section 12.2.4) used by the TPM to represent the credential public key.
 
 : Signing procedure
@@ -1832,10 +1831,10 @@ identity of the calling application.
 : Syntax
 :: An Android Attestation statement is a CBOR map with the following fields:
 
-    : version
+    : ver
     :: A text string indicating the version number of Google Play Services responsible for providing the SafetyNet API.
 
-    : safetyNetResponse
+    : response
     :: The value returned by the above SafetyNet API. This value is a JWS [[RFC7515]] object (see
         [SafetyNet online documentation](https://developer.android.com/training/safetynet/index.html#compat-check-response))
         in Compact Serialization.
@@ -1874,7 +1873,7 @@ This attestation statement format is used with FIDO U2F authenticators using the
     : x5c
     :: A byte string representing the U2F attestation certificate used for the attestation, encoded in X.509 format.
 
-    : signature
+    : sig
     :: A byte string containing the attestation signature.
 
 : Signing procedure