diff --git a/index.bs b/index.bs
index 81b194524..9cc2c53c5 100644
--- a/index.bs
+++ b/index.bs
@@ -145,7 +145,10 @@ spec: FIDO-U2F-Message-Formats; urlPrefix: https://fidoalliance.org/specs/fido-u
 
 spec: FIDO-Registry; urlPrefix: https://fidoalliance.org/specs/fido-v2.0-ps-20170927/fido-registry-v2.0-ps-20170927.html
     type: dfn
-        text: Section 3.6.2; url: public-key-representation-formats
+        text: Section 3.1 User Verification Methods; url: user-verification-methods
+        text: Section 3.2 Key Protection Types; url: key-protection-types
+        text: Section 3.3 Matcher Protection Types; url: matcher-protection-types
+        text: Section 3.6.2 Public Key Representation Formats; url: public-key-representation-formats
 
 spec: RFC4949; urlPrefix: https://tools.ietf.org/html/rfc4949
     type: dfn
@@ -3580,7 +3583,7 @@ This attestation statement format is used with FIDO U2F authenticators using the
     1. Extract the claimed |rpIdHash| from |authenticatorData|, and the claimed |credentialId| and |credentialPublicKey| from
         |authenticatorData|.<code>[=attestedCredentialData=]</code>.
     1. Convert the COSE_KEY formatted |credentialPublicKey| (see [=Section 7=] of [[!RFC8152]]) to Raw ANSI X9.62 public key
-        format (see ALG_KEY_ECC_X962_RAW in [=Section 3.6.2=] of [[!FIDO-Registry]]).
+        format (see ALG_KEY_ECC_X962_RAW in [=Section 3.6.2 Public Key Representation Formats=] of [[!FIDO-Registry]]).
         - Let |x| be the value corresponding to the "-2" key (representing x coordinate) in |credentialPublicKey|, and confirm its
             size to be of 32 bytes.
             If size differs or "-2" key is not found, terminate this algorithm and return an appropriate error.
@@ -4225,15 +4228,15 @@ This [=registration extension=] and [=authentication extension=] enables use of
     The semantics of the fields in each `uvmEntry` are as follows:
     : userVerificationMethod
     :: The authentication method/factor used by the authenticator to verify the user. Available values are defined in
-        [[!FIDOReg]], "User Verification Methods" section.
+        [=Section 3.1 User Verification Methods=] of [[!FIDO-Registry]].
 
     : keyProtectionType
     :: The method used by the authenticator to protect the FIDO registration private key material. Available values are defined
-        in [[!FIDOReg]], "Key Protection Types" section.
+        in [=Section 3.2 Key Protection Types=] of [[!FIDO-Registry]].
 
     : matcherProtectionType
     :: The method used by the authenticator to protect the matcher that performs user verification. Available values are defined
-        in [[!FIDOReg]], "Matcher Protection Types" section.
+        in [=Section 3.3 Matcher Protection Types=] of [[!FIDO-Registry]].
 
     If >3 factors can be used in an authentication instance the authenticator vendor MUST select the 3 factors it believes
     will be most relevant to the Server to include in the UVM.
@@ -5058,13 +5061,6 @@ for their contributions as our W3C Team Contacts.
     "status": "FIDO Alliance Proposed Standard"
   },
 
-  "FIDOReg": {
-    "authors": ["R. Lindemann", "D. Baghdasaryan", "B. Hill"],
-    "title": "FIDO UAF Registry of Predefined Values",
-    "href": "https://fidoalliance.org/specs/fido-uaf-v1.0-ps-20141208/fido-uaf-reg-v1.0-ps-20141208.html",
-    "status": "FIDO Alliance Proposed Standard"
-  },
-
   "FIDO-Registry": {
     "authors": ["R. Lindemann"],
     "title": "FIDO Registry of Predefined Values",