diff --git a/examples/ec-eaa.json b/examples/ec-eaa.json
index 5840ead82..efc9053ec 100644
--- a/examples/ec-eaa.json
+++ b/examples/ec-eaa.json
@@ -186,7 +186,7 @@
                                 }
                             ]
                         },
-                        "tax_id_code": {
+                        "personal_administrative_number": {
                             "value_type": "string",
                             "display": [
                                 {
@@ -194,7 +194,7 @@
                                     "locale": "it-IT"
                                 },
                                 {
-                                    "name": "Tax Id Number",
+                                    "name": "Tax Identification Number",
                                     "locale": "en-US"
                                 }
                             ]
@@ -553,12 +553,7 @@
                                         },
                                         {
                                             "path": [
-                                                "$.unique_id"
-                                            ]
-                                        },
-                                        {
-                                            "path": [
-                                                "$.tax_id_code"
+                                                "$.personal_administrative_number"
                                             ]
                                         }
                                     ]
diff --git a/examples/ec-rp.json b/examples/ec-rp.json
index b813021a9..299af4f57 100644
--- a/examples/ec-rp.json
+++ b/examples/ec-rp.json
@@ -92,12 +92,7 @@
                                     },
                                     {
                                         "path": [
-                                            "$.unique_id"
-                                        ]
-                                    },
-                                    {
-                                        "path": [
-                                            "$.tax_id_code"
+                                            "$.personal_administrative_number"
                                         ]
                                     }
                                 ]
diff --git a/examples/pid-mdoc-cbor-example.txt b/examples/pid-mdoc-cbor-example.txt
index 4cb72b934..8a2a44be0 100644
--- a/examples/pid-mdoc-cbor-example.txt
+++ b/examples/pid-mdoc-cbor-example.txt
@@ -27,11 +27,10 @@
                           3: h'E2382149255AE8E955AF9B8984395…',                                        
                           4: h'BBC77E6CCA981A3AD0C3E544EDF86…',                                     
                           6: h'BB6E6C68D1B4B4EC5A2AE9206F5t4…',
-                          7: h'F8A5966E6DAC9970E0334D8F75E25…',              
-                          8: h'DEFDF1AA746718016EF1B94BFE5R6…'
+                          7: h'F8A5966E6DAC9970E0334D8F75E25…'
                       },
                       "eu.europa.ec.eudiw.pid.it.1": {  
-                          9: h'F9EE4D36F67DBD75E23311AC1C29…'
+                          8: h'F9EE4D36F67DBD75E23311AC1C29…'
                       }
                   },                             
                   "deviceKeyInfo": {                              
@@ -89,7 +88,7 @@
                   "elementIdentifier": "given_name",
                   "elementValue": "Mario"                             
                   }                         
-              >>)),            
+              >>),            
               24(<<                            
                   {                               
                   "digestID": 6,                             
@@ -104,24 +103,16 @@
                   "random": h'6059FF1CE27B4997B4ADE1DE7B01DC60',
                   "elementIdentifier": "birth_date",
                   "elementValue": 1004("1956-01-12")% the tag 1004 defines the value    
-                                                      is a full date 
+                    is a full date 
                   }  
-              >>),         
-              24(<<  
-                  {                              
-                  "digestID": 8,                              
-                  "random": h'53C15C57B3B076E788795829190220B4',
-                  "elementIdentifier": "unique_id",
-                  "elementValue": "xxxxxxxx-xxx-xxxx-xxxxxxxxxxxx" 
-                  }   
               >>)
               ],
               "eu.europa.ec.eudiw.pid.it.1": [
                   24(<<
                       {
-                      "digestID": 9, 
+                      "digestID": 8, 
                       "random": h'11aa7273a2d2daa973f5951f0c34c2fbae',
-                      "elementIdentifier": "tax_id_number", 
+                      "elementIdentifier": "personal_administrative_number", 
                       "elementValue": "TINIT-XXXXXXXXXXXXXXX"
                       }                         
                   >>)                    
diff --git a/examples/presentation-definition.json b/examples/presentation-definition.json
index 1aaf4ec0c..0cb67ccc7 100644
--- a/examples/presentation-definition.json
+++ b/examples/presentation-definition.json
@@ -20,15 +20,6 @@
             "constraints": {
                 "limit_disclosure": "preferred",
                 "fields": [
-                    {
-                        "filter": {
-                            "const": "unique_id",
-                            "type": "string"
-                        },
-                        "path": [
-                            "$.credentialSubject.unique_id"
-                        ]
-                    },
                     {
                         "filter": {
                             "const": "given_name",
@@ -58,18 +49,18 @@
                     },
                     {
                         "filter": {
-                            "const": "tax_id_code",
+                            "const": "personal_administrative_number",
                             "type": "string"
                         },
                         "path": [
-                            "$.credentialSubject.tax_id_code"
+                            "$.credentialSubject.personal_administrative_number"
                         ]
                     }
                 ]
             }
         },
         {
-			"id": "WalletAttestation",
+            "id": "WalletAttestation",
             "name": "Wallet Attestation",
             "purpose": "Wallet Authentication",
 			"format": "jwt",