Merge userDisplayName and vendorDisplayName into authenticatorDisplay…

…Name

index.bs

@@ -1174,9 +1174,9 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
             If used, the [=[RP]=] SHOULD use this to describe the [=credential record=] in the user's account settings.
             The [=[RP]=] SHOULD allow the user to choose this value, and MAY allow the user to modify it at will.
 
-            The [=credProps|Credential Properties Extension=] defines two [=credential properties=],
-            {{CredentialPropertiesOutput/userDisplayName}} and {{CredentialPropertiesOutput/vendorDisplayName}},
-            which, when available, MAY be offered as defaults for this value.
+            The [=credProps|Credential Properties Extension=] defines the [=credential property=]
+            {{CredentialPropertiesOutput/authenticatorDisplayName}}
+            which, when available, MAY be offered as a default for this value.
             The [=[RP]=] MAY also derive a default value from the authenticator's [=attestation statement=], if any.
     </dl>
 
@@ -6619,32 +6619,23 @@ This [=client extension|client=] [=registration extension=] facilitates reportin
 
             Note: some [=authenticators=] create [=discoverable credentials=] even when not requested by the [=client platform=]. Because of this, [=client platforms=] may be forced to omit the {{rk}} property because they lack the assurance to be able to set it to [FALSE]. [=[RPS]=] should assume that, if the `credProps` extension is supported, then [=client platforms=] will endeavour to populate the {{rk}} property. Therefore a missing {{rk}} indicates that the created credential is most likely a [=non-discoverable credential=].
 
-        :   <dfn>userDisplayName</dfn>
-        ::  This OPTIONAL property is a [=human palatability|human-palatable=] description of the credential,
+        :   <dfn>authenticatorDisplayName</dfn>
+        ::  This OPTIONAL property is a [=human palatability|human-palatable=] description of the credential's [=managing authenticator=],
             chosen by the user.
 
             The [=client=] MUST allow the user to choose this value,
             MAY or MAY not present that choice during [=registration ceremonies=],
             and MAY reuse the same value for multiple credentials with the same [=managing authenticator=] across multiple [=[RPS]=].
-            The [=client=] MAY offer the user a default for this value.
-            The [=client=] MAY query the [=authenticator=], by some unspecified mechanism, for a suitable default value.
 
-            If the [=[RP]=] includes a <code>[$credential record/displayName$]</code> [=struct/item=] in [=credential records=],
-            the [=[RP]=] MAY offer this value, if present,
-            as a default value for the <code>[$credential record/displayName$]</code> of the new [=credential record=].
-
-        :   <dfn>vendorDisplayName</dfn>
-        ::  This OPTIONAL property is a [=human palatability|human-palatable=] description of the credential,
-            chosen by the [=authenticator=] vendor.
-
-            The [=client=] MAY query the [=authenticator=], by some unspecified mechanism, for this value,
-            MAY allow the user to override that value, if any,
-            and MAY reuse the same value for multiple credentials across multiple [=[RPS]=].
+            The [=client=] MAY query the [=authenticator=], by some unspecified mechanism, for this value.
+            The [=authenticator=] MAY allow the user to configure the response to such a query.
+            The [=authenticator=] vendor MAY provide a default response to such a query.
+            The [=client=] MAY consider a user-configured response chosen by the user,
+            and SHOULD allow the user to modify a vendor-provided default response.
 
             If the [=[RP]=] includes a <code>[$credential record/displayName$]</code> [=struct/item=] in [=credential records=],
             the [=[RP]=] MAY offer this value, if present,
             as a default value for the <code>[$credential record/displayName$]</code> of the new [=credential record=].
-            {{userDisplayName}} SHOULD take precedence over {{vendorDisplayName}} if present.
     </div>