diff --git a/1.0/examples/query_lang/claims_alternatives.json b/1.0/examples/query_lang/claims_alternatives.json
index 7a31ca69..e2a9a201 100644
--- a/1.0/examples/query_lang/claims_alternatives.json
+++ b/1.0/examples/query_lang/claims_alternatives.json
@@ -7,7 +7,7 @@
         "vct_values": [ "https://credentials.example.com/identity_credential" ]
       },
       "claims": [
-        {"id": "a", "path": ["last_name"]},
+        {"id": "a", "path": ["family_name"]},
         {"id": "b", "path": ["postal_code"]},
         {"id": "c", "path": ["locality"]},
         {"id": "d", "path": ["region"]},
@@ -19,4 +19,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.0/examples/query_lang/multi_credentials.json b/1.0/examples/query_lang/multi_credentials.json
index 73d4ff93..b2c0d15f 100644
--- a/1.0/examples/query_lang/multi_credentials.json
+++ b/1.0/examples/query_lang/multi_credentials.json
@@ -20,8 +20,8 @@
       },
       "claims": [
         {"path": ["org.iso.7367.1", "vehicle_holder"]},
-        {"path": ["org.iso.18013.5.1", "first_name"]}
+        {"path": ["org.iso.18013.5.1", "given_name"]}
       ]
     }
 ]
-}
\ No newline at end of file
+}
diff --git a/1.0/examples/query_lang/simple.json b/1.0/examples/query_lang/simple.json
index a26cfebe..682b2d54 100644
--- a/1.0/examples/query_lang/simple.json
+++ b/1.0/examples/query_lang/simple.json
@@ -7,10 +7,10 @@
         "vct_values": [ "https://credentials.example.com/identity_credential" ]
       },
       "claims": [
-          {"path": ["last_name"]},
-          {"path": ["first_name"]},
+          {"path": ["family_name"]},
+          {"path": ["given_name"]},
           {"path": ["address", "street_address"]}       
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.0/examples/query_lang/simple_mdoc.json b/1.0/examples/query_lang/simple_mdoc.json
index 65ab94e7..3ab597ff 100644
--- a/1.0/examples/query_lang/simple_mdoc.json
+++ b/1.0/examples/query_lang/simple_mdoc.json
@@ -8,8 +8,8 @@
       },
       "claims": [
         {"path": ["org.iso.7367.1", "vehicle_holder"]},
-        {"path": ["org.iso.18013.5.1", "first_name"]}
+        {"path": ["org.iso.18013.5.1", "given_name"]}
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.0/examples/query_lang/value_matching_simple.json b/1.0/examples/query_lang/value_matching_simple.json
index 1aca76bd..87672b7c 100644
--- a/1.0/examples/query_lang/value_matching_simple.json
+++ b/1.0/examples/query_lang/value_matching_simple.json
@@ -8,10 +8,10 @@
       },
       "claims": [
           {
-            "path": ["last_name"],
+            "path": ["family_name"],
             "values": ["Doe"]
           },
-          {"path": ["first_name"]},
+          {"path": ["given_name"]},
           {"path": ["address", "street_address"]},
           {
             "path": ["postal_code"],
@@ -20,4 +20,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.0/openid-4-verifiable-presentations-1_0.md b/1.0/openid-4-verifiable-presentations-1_0.md
index a66d80f1..915752f7 100644
--- a/1.0/openid-4-verifiable-presentations-1_0.md
+++ b/1.0/openid-4-verifiable-presentations-1_0.md
@@ -456,8 +456,8 @@ Where the contents of the `request` query parameter consist of a base64url-encod
           "vct_values": [ "https://credentials.example.com/identity_credential" ]
         },
         "claims": [
-            {"path": ["last_name"]},
-            {"path": ["first_name"]}   
+            {"path": ["family_name"]},
+            {"path": ["given_name"]}   
         ]
       }
     ]
@@ -1129,8 +1129,8 @@ claims:
 
 The following is a non-normative example of a DCQL query that requests a
 Credential of the format `dc+sd-jwt` with a type value of
-`https://credentials.example.com/identity_credential` and the claims `last_name`,
-`first_name`, and `address.street_address`:
+`https://credentials.example.com/identity_credential` and the claims `family_name`,
+`given_name`, and `address.street_address`:
 
 <{{examples/query_lang/simple.json}}
 
@@ -1337,8 +1337,8 @@ a few public keys for encryption in the `jwks` member of the `client_metadata` r
       "vct_values": ["https://credentials.example.com/identity_credential"]
     },
     "claims": [
-      {"path": ["last_name"]},
-      {"path": ["first_name"]},
+      {"path": ["family_name"]},
+      {"path": ["given_name"]},
       {"path": ["address", "postal_code"]}
      ]
     }
@@ -3290,7 +3290,7 @@ Note: The `nonce` and `aud` are set to the `nonce` of the request and the Client
 
 The following is a non-normative example of a DCQL query that requests a Verifiable
 Credential in the format `mso_mdoc` with the claims `vehicle_holder` and
-`first_name`:
+`given_name`:
 
 <{{examples/query_lang/simple_mdoc.json}}
 
@@ -3313,13 +3313,13 @@ come from an mDL or a photoid Credential.
 
 The following is a non-normative example of a DCQL query that requests 
 
-- the mandatory claims `last_name` and `date_of_birth`, and
+- the mandatory claims `family_name` and `date_of_birth`, and
 - either the claim `postal_code`, or, if that is not available, both of the claims `locality` and `region`.
 
 <{{examples/query_lang/claims_alternatives.json}}
 
 The following example shows a query that uses the `values` constraints
-to request a Credential with specific values for the `last_name` and `postal_code` claims:
+to request a Credential with specific values for the `family_name` and `postal_code` claims:
 
 <{{examples/query_lang/value_matching_simple.json}}
 
diff --git a/1.1/examples/query_lang/claims_alternatives.json b/1.1/examples/query_lang/claims_alternatives.json
index 7a31ca69..e2a9a201 100644
--- a/1.1/examples/query_lang/claims_alternatives.json
+++ b/1.1/examples/query_lang/claims_alternatives.json
@@ -7,7 +7,7 @@
         "vct_values": [ "https://credentials.example.com/identity_credential" ]
       },
       "claims": [
-        {"id": "a", "path": ["last_name"]},
+        {"id": "a", "path": ["family_name"]},
         {"id": "b", "path": ["postal_code"]},
         {"id": "c", "path": ["locality"]},
         {"id": "d", "path": ["region"]},
@@ -19,4 +19,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.1/examples/query_lang/multi_credentials.json b/1.1/examples/query_lang/multi_credentials.json
index 73d4ff93..b2c0d15f 100644
--- a/1.1/examples/query_lang/multi_credentials.json
+++ b/1.1/examples/query_lang/multi_credentials.json
@@ -20,8 +20,8 @@
       },
       "claims": [
         {"path": ["org.iso.7367.1", "vehicle_holder"]},
-        {"path": ["org.iso.18013.5.1", "first_name"]}
+        {"path": ["org.iso.18013.5.1", "given_name"]}
       ]
     }
 ]
-}
\ No newline at end of file
+}
diff --git a/1.1/examples/query_lang/simple.json b/1.1/examples/query_lang/simple.json
index a26cfebe..682b2d54 100644
--- a/1.1/examples/query_lang/simple.json
+++ b/1.1/examples/query_lang/simple.json
@@ -7,10 +7,10 @@
         "vct_values": [ "https://credentials.example.com/identity_credential" ]
       },
       "claims": [
-          {"path": ["last_name"]},
-          {"path": ["first_name"]},
+          {"path": ["family_name"]},
+          {"path": ["given_name"]},
           {"path": ["address", "street_address"]}       
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.1/examples/query_lang/simple_mdoc.json b/1.1/examples/query_lang/simple_mdoc.json
index 65ab94e7..3ab597ff 100644
--- a/1.1/examples/query_lang/simple_mdoc.json
+++ b/1.1/examples/query_lang/simple_mdoc.json
@@ -8,8 +8,8 @@
       },
       "claims": [
         {"path": ["org.iso.7367.1", "vehicle_holder"]},
-        {"path": ["org.iso.18013.5.1", "first_name"]}
+        {"path": ["org.iso.18013.5.1", "given_name"]}
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.1/examples/query_lang/value_matching_simple.json b/1.1/examples/query_lang/value_matching_simple.json
index 1aca76bd..87672b7c 100644
--- a/1.1/examples/query_lang/value_matching_simple.json
+++ b/1.1/examples/query_lang/value_matching_simple.json
@@ -8,10 +8,10 @@
       },
       "claims": [
           {
-            "path": ["last_name"],
+            "path": ["family_name"],
             "values": ["Doe"]
           },
-          {"path": ["first_name"]},
+          {"path": ["given_name"]},
           {"path": ["address", "street_address"]},
           {
             "path": ["postal_code"],
@@ -20,4 +20,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/1.1/openid-4-verifiable-presentations-1_1.md b/1.1/openid-4-verifiable-presentations-1_1.md
index 32e4b046..cf7f2f8c 100644
--- a/1.1/openid-4-verifiable-presentations-1_1.md
+++ b/1.1/openid-4-verifiable-presentations-1_1.md
@@ -452,8 +452,8 @@ Where the contents of the `request` query parameter consist of a base64url-encod
           "vct_values": [ "https://credentials.example.com/identity_credential" ]
         },
         "claims": [
-            {"path": ["last_name"]},
-            {"path": ["first_name"]}   
+            {"path": ["family_name"]},
+            {"path": ["given_name"]}
         ]
       }
     ]
@@ -1125,8 +1125,8 @@ claims:
 
 The following is a non-normative example of a DCQL query that requests a
 Credential of the format `dc+sd-jwt` with a type value of
-`https://credentials.example.com/identity_credential` and the claims `last_name`,
-`first_name`, and `address.street_address`:
+`https://credentials.example.com/identity_credential` and the claims `family_name`,
+`given_name`, and `address.street_address`:
 
 <{{examples/query_lang/simple.json}}
 
@@ -1333,8 +1333,8 @@ a few public keys for encryption in the `jwks` member of the `client_metadata` r
       "vct_values": ["https://credentials.example.com/identity_credential"]
     },
     "claims": [
-      {"path": ["last_name"]},
-      {"path": ["first_name"]},
+      {"path": ["family_name"]},
+      {"path": ["given_name"]},
       {"path": ["address", "postal_code"]}
      ]
     }
@@ -3286,7 +3286,7 @@ Note: The `nonce` and `aud` are set to the `nonce` of the request and the Client
 
 The following is a non-normative example of a DCQL query that requests a Verifiable
 Credential in the format `mso_mdoc` with the claims `vehicle_holder` and
-`first_name`:
+`given_name`:
 
 <{{examples/query_lang/simple_mdoc.json}}
 
@@ -3309,13 +3309,13 @@ come from an mDL or a photoid Credential.
 
 The following is a non-normative example of a DCQL query that requests 
 
-- the mandatory claims `last_name` and `date_of_birth`, and
+- the mandatory claims `family_name` and `date_of_birth`, and
 - either the claim `postal_code`, or, if that is not available, both of the claims `locality` and `region`.
 
 <{{examples/query_lang/claims_alternatives.json}}
 
 The following example shows a query that uses the `values` constraints
-to request a Credential with specific values for the `last_name` and `postal_code` claims:
+to request a Credential with specific values for the `family_name` and `postal_code` claims:
 
 <{{examples/query_lang/value_matching_simple.json}}
 
@@ -3562,4 +3562,4 @@ The technology described in this specification was made available from contribut
 
    -01
 
-   * Clarify that `encrypted_response_enc_values_supported` applies only if JWE content encryption algorithm is used; e.g., it does not apply to JOSE HPKE
\ No newline at end of file
+   * Clarify that `encrypted_response_enc_values_supported` applies only if JWE content encryption algorithm is used; e.g., it does not apply to JOSE HPKE