diff --git a/openid-federation-1_0.xml b/openid-federation-1_0.xml
index 7fa24e2..314cbdb 100644
--- a/openid-federation-1_0.xml
+++ b/openid-federation-1_0.xml
@@ -78,7 +78,7 @@
       </address>
     </author>
 
-    <date day="14" month="January" year="2026"/>
+    <date day="17" month="January" year="2026"/>
 
     <workgroup>OpenID Connect Working Group</workgroup>
 
@@ -1057,7 +1057,7 @@
   "iss": "https://feide.no",
   "sub": "https://ntnu.no",
   "iat": 1516239022,
-  "exp": 1516298022,
+  "exp": 1516843822,
   "jwks": {
     "keys": [
       {
@@ -1065,7 +1065,7 @@
         "alg": "RS256",
         "use": "sig",
         "kid": "NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs",
-        "n": "pnXBOusEANuug6ewezb9J_...",
+        "n": "vHOJrp-zLST7FwvzAwelR9Vo...",
         "e": "AQAB"
       }
     ]
@@ -1478,7 +1478,7 @@
               scheme and MAY contain port,
               path, and query parameter components;
               it MUST NOT contain a fragment component.
-              Any federation Entity MAY publish a
+              Any Federation Entity MAY publish a
               <spanx style="verb">federation_resolve_endpoint</spanx>.
             </t>
             <t hangText="federation_trust_mark_status_endpoint">
@@ -1614,15 +1614,15 @@
 	  </name>
 	  <artwork><![CDATA[
     {
-      "iss": "https://openid.sunet.se",
-      "sub": "https://openid.sunet.se",
+      "iss": "https://rp.sunet.se",
+      "sub": "https://rp.sunet.se",
       "iat": 1516239022,
-      "exp": 1516298022,
+      "exp": 1516843822,
       "metadata": {
         "openid_relying_party": {
           "application_type": "web",
           "redirect_uris": [
-            "https://openid.sunet.se/rp/callback"
+            "https://rp.sunet.se/callback"
           ],
           "organization_name": "SUNET",
           "logo_uri": "https://www.sunet.se/sunet/images/32x32.png",
@@ -1630,8 +1630,8 @@
             "authorization_code",
             "implicit"
           ],
-          "signed_jwks_uri": "https://openid.sunet.se/rp/signed_jwks.jose",
-          "jwks_uri": "https://openid.sunet.se/rp/jwks.json",
+          "signed_jwks_uri": "https://rp.sunet.se/signed_jwks.jose",
+          "jwks_uri": "https://rp.sunet.se/jwks.json",
           "client_registration_types": ["automatic"]
         }
       },
@@ -1640,9 +1640,9 @@
           {
             "alg": "RS256",
             "e": "AQAB",
-            "kid": "key1",
+            "kid": "Ge7hs3smulgio8glvURJadmj...",
             "kty": "RSA",
-            "n": "pnXBOusEANuug6ewezb9J_...",
+            "n": "iE0ZGqI4TNopx52dGHm0EYhl...",
             "use": "sig"
           }
         ]
@@ -1725,8 +1725,8 @@
    "metadata":{
       "openid_provider":{
          "issuer": "https://op.umu.se",
-         "signed_jwks_uri": "https://op.umu.se/openid/signed_jwks.jose",
-         "authorization_endpoint": "https://op.umu.se/openid/authorization",
+         "signed_jwks_uri": "https://op.umu.se/signed_jwks.jose",
+         "authorization_endpoint": "https://op.umu.se/authorization",
          "client_registration_types_supported":[
             "automatic",
             "explicit"
@@ -1751,15 +1751,15 @@
             "pairwise",
             "public"
          ],
-         "token_endpoint": "https://op.umu.se/openid/token",
-         "federation_registration_endpoint": "https://op.umu.se/openid/fedreg",
+         "token_endpoint": "https://op.umu.se/token",
+         "federation_registration_endpoint": "https://op.umu.se/fedreg",
          "token_endpoint_auth_methods_supported":[
             "client_secret_post",
             "client_secret_basic",
             "client_secret_jwt",
             "private_key_jwt"
          ],
-         "pushed_authorization_request_endpoint": "https://op.umu.se/openid/par",
+         "pushed_authorization_request_endpoint": "https://op.umu.se/par",
          "request_object_signing_alg_values_supported": [
             "ES256",
             "RS256"
@@ -3784,9 +3784,9 @@
         {
           "alg": "RS256",
           "e": "AQAB",
-          "kid": "key1",
+          "kid": "Jlob6qNFuSHj3sfuntz9C_9s...",
           "kty": "RSA",
-          "n": "pnXBOusEANuug6ewezb9J_...",
+          "n": "_LioMsSeycE4pELlpPYgZluB...",
           "use": "sig"
         }
       ]
@@ -3969,10 +3969,10 @@
 	    </name>
             <artwork><![CDATA[
 {
-  "iss": "https://rp.example.it/spid/",
-  "sub": "https://rp.example.it/spid/",
+  "iss": "https://rp.example.it/spid",
+  "sub": "https://rp.example.it/spid",
   "iat": 1516239022,
-  "exp": 1516298022,
+  "exp": 1516843822,
   "trust_marks": [
     {
      "trust_mark_type": "https://www.spid.gov.it/certification/rp",
@@ -3998,7 +3998,7 @@
     "openid_relying_party": {
       "application_type": "web",
       "client_registration_types": ["automatic"],
-      "client_name": "https://rp.example.it/spid/",
+      "client_name": "https://rp.example.it/spid",
       "contacts": [
         "ops@rp.example.it"
       ]
@@ -4279,14 +4279,14 @@
           <figure>
             <preamble>
               The following is a non-normative example of an HTTP GET request for
-	      a Subordinate Statement from edugain.org about https://openid.sunet.se:
+	      a Subordinate Statement from edugain.org about https://sunet.se:
             </preamble>
             <name>
 	      API Request for a Subordinate Statement
             </name>
             <artwork><![CDATA[
 GET /federation_fetch_endpoint?
-sub=https%3A%2F%2Fopenid%2Esunet%2Ese HTTP/1.1
+sub=https%3A%2F%2Fsunet%2Ese HTTP/1.1
 Host: edugain.org
 ]]></artwork>
           </figure>
@@ -4319,7 +4319,7 @@ Host: edugain.org
             <artwork><![CDATA[
 {
   "iss": "https://edugain.org",
-  "sub": "https://openid.sunet.se",
+  "sub": "https://sunet.se",
   "exp": 1568397247,
   "iat": 1568310847,
   "source_endpoint": "https://edugain.org/federation_fetch_endpoint",
@@ -4530,7 +4530,7 @@ Host: edugain.org
             </name>
             <artwork><![CDATA[
 GET /list HTTP/1.1
-Host: openid.sunet.se
+Host: sunet.se
 ]]></artwork>
           </figure>
         </section>
@@ -4561,7 +4561,7 @@ Host: openid.sunet.se
 Content-Type: application/json
 
 [
-  "https://ntnu.andreas.labs.uninett.no/",
+  "https://ntnu.andreas.labs.uninett.no",
   "https://blackboard.ntnu.no/openid/callback",
   "https://serviceprovider.andreas.labs.uninett.no/application17"
 ]
@@ -4651,7 +4651,7 @@ GET /resolve?
 sub=https%3A%2F%2Fop.example.it%2Fspid&
 entity_type=openid_provider&
 trust_anchor=https%3A%2F%2Fswamid.se HTTP/1.1
-Host: openid.sunet.se
+Host: sunet.se
 ]]></artwork>
           </figure>
         </section>
@@ -4784,10 +4784,10 @@ Host: openid.sunet.se
             </name>
             <artwork><![CDATA[
 {
-  "iss": "https://resolver.spid.gov.it/",
-  "sub": "https://op.example.it/spid/",
+  "iss": "https://resolver.spid.gov.it",
+  "sub": "https://op.example.it/spid",
   "iat": 1516239022,
-  "exp": 1516298022,
+  "exp": 1516843822,
   "metadata": {
     "openid_provider": {
       "contacts": ["legal@example.it", "technical@example.it"],
@@ -4830,12 +4830,12 @@ Host: openid.sunet.se
        "eyJ0eXAiOiJ0cnVzdC1tYXJrK2p3dCIsImFsZyI6IlJTMjU2Iiwia2lkIjoiOH
         hzdUtXaVZmd1NnSG9mMVRlNE9VZGN5NHE3ZEpyS2ZGUmxPNXhoSElhMCJ9.
         eyJpc3MiOiJodHRwczovL3d3dy5hZ2lkLmdvdi5pdCIsInN1YiI6Imh0dHBzOi
-        8vb3AuZXhhbXBsZS5pdC9zcGlkLyIsImlhdCI6MTU3OTYyMTE2MCwidHJ1c3Rf
-        bWFya190eXBlIjoiaHR0cHM6Ly93d3cuc3BpZC5nb3YuaXQvY2VydGlmaWNhdG
-        lvbi9vcC8iLCJsb2dvX3VyaSI6Imh0dHBzOi8vd3d3LmFnaWQuZ292Lml0L3Ro
-        ZW1lcy9jdXN0b20vYWdpZC9sb2dvLnN2ZyIsInJlZiI6Imh0dHBzOi8vZG9jcy
-        5pdGFsaWEuaXQvaXRhbGlhL3NwaWQvc3BpZC1yZWdvbGUtdGVjbmljaGUtb2lk
-        Yy9pdC9zdGFiaWxlL2luZGV4Lmh0bWwifQ.
+        8vb3AuZXhhbXBsZS5pdC9zcGlkIiwiaWF0IjoxNTc5NjIxMTYwLCJ0cnVzdF9t
+        YXJrX3R5cGUiOiJodHRwczovL3d3dy5zcGlkLmdvdi5pdC9jZXJ0aWZpY2F0aW
+        9uL29wLyIsImxvZ29fdXJpIjoiaHR0cHM6Ly93d3cuYWdpZC5nb3YuaXQvdGhl
+        bWVzL2N1c3RvbS9hZ2lkL2xvZ28uc3ZnIiwicmVmIjoiaHR0cHM6Ly9kb2NzLm
+        l0YWxpYS5pdC9pdGFsaWEvc3BpZC9zcGlkLXJlZ29sZS10ZWNuaWNoZS1vaWRj
+        L2l0L3N0YWJpbGUvaW5kZXguaHRtbCJ9.
         xyz-PDQ_..."
     }
   ],
@@ -5465,7 +5465,7 @@ Host: trust-anchor.example.com
             <artwork><![CDATA[
 {
     "iss": "https://trust-anchor.federation.example.com",
-    "iat": 123972394272,
+    "iat": 1666335600,
     "keys":
         [
             {
@@ -5473,18 +5473,18 @@ Host: trust-anchor.example.com
                 "n": "5s4qi ...",
                 "e": "AQAB",
                 "kid": "2HnoFS3YnC9tjiCaivhWLVUJ3AxwGGz_98uRFaqMEEs",
-                "iat": 123972394872,
-                "exp": 123974395972
+                "iat": 1661151600,
+                "exp": 1677052800
             },
             {
                 "kty": "RSA",
                 "n": "ng5jr ...",
                 "e": "AQAB",
                 "kid": "8KnoFS3YnC9tjiCaivhWLVUJ3AxwGGz_98uRFaqMJJr",
-                "iat": 123972394872,
-                "exp": 123974394972,
+                "iat": 1647932400,
+                "exp": 1663830000,
                 "revoked": {
-                  "revoked_at": 123972495172,
+                  "revoked_at": 1661151600,
                   "reason": "compromised",
                 }
             }
@@ -5872,7 +5872,7 @@ Content-Type: application/json
           <figure>
 	    <preamble>
 	      In this example, the requesting party would make the following request to the Entity
-	      <spanx style="verb">https://openid.sunet.se</spanx>
+	      <spanx style="verb">https://op.sunet.se</spanx>
 	      to obtain its Entity Configuration:
 	    </preamble>
             <name>
@@ -5880,7 +5880,7 @@ Content-Type: application/json
             </name>
             <artwork><![CDATA[
   GET /.well-known/openid-federation HTTP/1.1
-  Host: openid.sunet.se
+  Host: op.sunet.se
 ]]></artwork>
           </figure>
         </t>
@@ -5890,7 +5890,7 @@ Content-Type: application/json
         <t>
 	  The response is an Entity Configuration.
           If the Entity is an Intermediate Entity or a Trust Anchor, the
-          response MUST contain metadata for a federation Entity
+          response MUST contain metadata for a Federation Entity
           (<spanx style="verb">federation_entity</spanx>).
         </t>
         <t>
@@ -5909,26 +5909,61 @@ Content-Type: application/json
 	      Intermediate Entity:
 	    </preamble>
             <name>
-	      Entity Configuration Response JWT Claims Set
+	      Entity Configuration Response JWT Claims Set for an Intermediate
             </name>
             <artwork><![CDATA[
 {
-  "iss": "https://openid.sunet.se",
-  "sub": "https://openid.sunet.se",
+  "iss": "https://sunet.se",
+  "sub": "https://sunet.se",
   "iat": 1516239022,
-  "exp": 1516298022,
+  "exp": 1516843822,
   "metadata": {
     "federation_entity": {
       "contacts": ["ops@sunet.se"],
-      "federation_fetch_endpoint": "https://sunet.se/openid/fedapi",
+      "federation_fetch_endpoint": "https://sunet.se/fetch",
       "organization_uri": "https://www.sunet.se",
       "organization_name": "SUNET"
     },
+  "jwks": {
+    "keys": [
+      {
+        "alg": "RS256",
+        "e": "AQAB",
+        "kid": "O-wFRGNsy0-4SR2jbXYwDHy6...",
+        "kty": "RSA",
+        "n": "Qo3n0N0Gv7L8T9I_2sAMc0I4...",
+        "use": "sig"
+      }
+    ]
+  },
+  "authority_hints": [
+    "https://edugain.org"
+  ]
+}
+]]></artwork>
+          </figure>
+        </t>
+        <t>
+          <figure>
+	    <preamble>
+	      The following is a non-normative example JWT Claims Set for a response from an
+	      OpenID Provider Entity:
+	    </preamble>
+            <name>
+	      Entity Configuration Response JWT Claims Set for an OP
+            </name>
+            <artwork><![CDATA[
+{
+  "iss": "https://op.sunet.se",
+  "sub": "https://op.sunet.se",
+  "iat": 1516239022,
+  "exp": 1516843822,
+  "metadata": {
     "openid_provider": {
-      "issuer": "https://openid.sunet.se",
-      "signed_jwks_uri": "https://openid.sunet.se/jwks.jose",
+      "issuer": "https://op.sunet.se",
+      "signed_jwks_uri": "https://op.sunet.se/jwks.jose",
       "authorization_endpoint":
-        "https://openid.sunet.se/authorization",
+        "https://op.sunet.se/authorization",
       "client_registration_types_supported": [
         "automatic",
         "explicit"
@@ -5939,10 +5974,13 @@ Content-Type: application/json
       "id_token_signing_alg_values_supported": [
         "ES256", "RS256"
       ],
+      "contacts": ["ops@sunet.se"],
+      "organization_uri": "https://www.sunet.se",
+      "organization_name": "SUNET"
       "logo_uri":
-        "https://www.umu.se/img/umu-logo-left-neg-SE.svg",
+        "https://www.sunet.se/sunet/images/32x32.png",
       "op_policy_uri":
-        "https://www.umu.se/en/website/legal-information/",
+        "https://www.sunet.se/en/website/legal-information/",
       "response_types_supported": [
         "code"
       ],
@@ -5950,13 +5988,12 @@ Content-Type: application/json
         "pairwise",
         "public"
       ],
-      "token_endpoint": "https://openid.sunet.se/token",
+      "token_endpoint": "https://op.sunet.se/token",
       "federation_registration_endpoint":
-        "https://op.umu.se/openid/fedreg",
+        "https://op.sunet.se/fedreg",
       "token_endpoint_auth_methods_supported": [
         "private_key_jwt"
       ]
-
     }
   },
   "jwks": {
@@ -5964,15 +6001,15 @@ Content-Type: application/json
       {
         "alg": "RS256",
         "e": "AQAB",
-        "kid": "key1",
+        "kid": "yHozfrAd5G-pnmG4e1jCXpfc...",
         "kty": "RSA",
-        "n": "pnXBOusEANuug6ewezb9J_...",
+        "n": "HIoSq4wkZiEkJDTPHiv7torK...",
         "use": "sig"
       }
     ]
   },
   "authority_hints": [
-    "https://edugain.org/federation"
+    "https://sunet.se"
   ]
 }
 ]]></artwork>
@@ -6522,7 +6559,7 @@ Content-Type: application/json
 {
   "typ": "oauth-authz-req+jwt",
   "alg": "RS256",
-  "kid": "that-kid-which-points-to-a-jwk-contained-in-the-trust-chain",
+  "kid": "kid-that-points-to-a-jwk-contained-in-the-trust-chain",
   "trust_chain" : [
     "eyJhbGciOiJSUzI1NiIsImtpZCI6Ims1NEhRdERpYnlHY3M5WldWTWZ2aUhm ...",
     "eyJhbGciOiJSUzI1NiIsImtpZCI6IkJYdmZybG5oQU11SFIwN2FqVW1BY0JS ...",
@@ -10606,10 +10643,10 @@ HTTP/1.1 302 Found
   },
   "metadata": {
     "openid_provider": {
-      "issuer": "https://op.umu.se/openid",
-      "signed_jwks_uri": "https://op.umu.se/openid/jwks.jose",
+      "issuer": "https://op.umu.se",
+      "signed_jwks_uri": "https://op.umu.se/jwks.jose",
       "authorization_endpoint":
-        "https://op.umu.se/openid/authorization",
+        "https://op.umu.se/authorization",
       "client_registration_types_supported": [
         "automatic",
         "explicit"
@@ -10636,9 +10673,9 @@ HTTP/1.1 302 Found
         "pairwise",
         "public"
       ],
-      "token_endpoint": "https://op.umu.se/openid/token",
+      "token_endpoint": "https://op.umu.se/token",
       "federation_registration_endpoint":
-        "https://op.umu.se/openid/fedreg",
+        "https://op.umu.se/fedreg",
       "token_endpoint_auth_methods_supported": [
         "client_secret_post",
         "client_secret_basic",
@@ -11141,13 +11178,13 @@ Host: geant.org
             <artwork><![CDATA[
 {
   "authorization_endpoint":
-    "https://op.umu.se/openid/authorization",
+    "https://op.umu.se/authorization",
   "contacts": [
     "ops@swamid.se",
     "ops@edugain.geant.org"
   ],
   "federation_registration_endpoint":
-    "https://op.umu.se/openid/fedreg",
+    "https://op.umu.se/fedreg",
   "client_registration_types_supported": [
     "automatic",
     "explicit"
@@ -11161,8 +11198,8 @@ Host: geant.org
     "RS256",
     "ES256"
   ],
-  "issuer": "https://op.umu.se/openid",
-  "signed_jwks_uri": "https://op.umu.se/openid/jwks.jose",
+  "issuer": "https://op.umu.se",
+  "signed_jwks_uri": "https://op.umu.se/jwks.jose",
   "logo_uri":
     "https://www.umu.se/img/umu-logo-left-neg-SE.svg",
   "organization_name": "University of Umeå",
@@ -11177,7 +11214,7 @@ Host: geant.org
   "subject_types_supported": [
     "pairwise"
   ],
-  "token_endpoint": "https://op.umu.se/openid/token",
+  "token_endpoint": "https://op.umu.se/token",
   "token_endpoint_auth_methods_supported": [
     "private_key_jwt",
     "client_secret_jwt"
@@ -11490,11 +11527,9 @@ Host: op.umu.se
       {
         "kty": "RSA",
         "use": "sig",
-        "kid":
-          "U2JTWHY0VFg0a2FEVVdTaHptVDJsNDNiSDk5MXRBVEtNSFVkeXZwb",
+        "kid": "U2JTWHY0VFg0a2FEVVdTaHptVDJsNDNiSDk5MXRBVEtNSFVkeXZwb",
         "e": "AQAB",
-        "n":
-          "4AZjgqFwMhTVSLrpzzNcwaCyVD88C_Hb3Bmor97vH-2AzldhuVb8K..."
+        "n": "4AZjgqFwMhTVSLrpzzNcwaCyVD88C_Hb3Bmor97vH-2AzldhuVb8K..."
       }
     ]
   },
@@ -11574,11 +11609,9 @@ Host: op.umu.se
       {
         "kty": "RSA",
         "use": "sig",
-        "kid":
-          "U2JTWHY0VFg0a2FEVVdTaHptVDJsNDNiSDk5MXRBVEtNSFVkeXZwb",
+        "kid": "U2JTWHY0VFg0a2FEVVdTaHptVDJsNDNiSDk5MXRBVEtNSFVkeXZwb",
         "e": "AQAB",
-        "n":
-          "4AZjgqFwMhTVSLrpzzNcwaCyVD88C_Hb3Bmor97vH-2AzldhuVb8K..."
+        "n": "4AZjgqFwMhTVSLrpzzNcwaCyVD88C_Hb3Bmor97vH-2AzldhuVb8K..."
       },
       {
         "kty": "EC",
@@ -11676,6 +11709,13 @@ Host: op.umu.se
 	    Fixed Trust Mark Delegation validation to handle optional <spanx style="verb">exp</spanx> Claim.
 	  </t>
 	  <t>
+	    Fixed #327: Use separate examples for Intermediate and OP Entity Configurations.
+	  </t>
+	  <t>
+	    Changed some "iss" and "exp" dates in examples so they make better sense.
+	  </t>
+	  <t>
+	    Changed "kid" values in examples to be plausible JWK Thumbprint values for their keys.
 	    Added informative references to OpenID Federation 1.1 and
 	    OpenID Connect Federation 1.1 specifications.
 	  </t>