--- SURFconext/https%3A%2F%2Fsp.korp.csc.fi%2F.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.korp.csc.fi%2F.xml
@@ -1,52 +1,62 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://sp.korp.csc.fi/" validUntil="2025-04-16T00:10:02.39955Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.korp.csc.fi/">
   <Extensions>
     <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
       <RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</RegistrationPolicy>
     </RegistrationInfo>
+    <EntityAttributes xmlns="urn:oasis:names:tc:SAML:metadata:attribute">
+      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
+        <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
+        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
+      </Attribute>
+    </EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="en">Korp – search service for text material</DisplayName>
-        <DisplayName xml:lang="nl">Korp – search service for text material</DisplayName>
-        <Description xml:lang="en">Korp is a user interface for language researchers to examine text material.</Description>
-        <Description xml:lang="nl">Dienst voor het bestuderen van tekstcorpora (Het aanvragen van deze dienst is automatisch een aanvraag voor alle Clarin diensten)</Description>
-        <Logo height="66" width="168" xml:lang="en">https://korp.csc.fi/img/korplogo.png</Logo>
+        <DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</DisplayName>
+        <DisplayName xml:lang="en">Concordance search service for text corpora</DisplayName>
+        <Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</Description>
+        <Description xml:lang="en">With this service you can study text corpora.</Description>
+        <Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</Logo>
+        <InformationURL xml:lang="en">https://www.kielipankki.fi/support/korp/</InformationURL>
+        <InformationURL xml:lang="fi">https://www.kielipankki.fi/tuki/korp/</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIFxzCCA6+gAwIBAgIJAPpACXfu18aIMA0GCSqGSIb3DQEBDQUAMHkxCzAJBgNVBAYTAkZJMRAwDgYDVQQIDAdVdXNpbWFhMQ4wDAYDVQQHDAVFc3BvbzEvMC0GA1UECgwmQ1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMgT3kxFzAVBgNVBAMMDnNwLmtvcnAuY3NjLmZpMCAXDTE4MTIyMTExNTA0MFoYDzk5OTkxMjMxMTE1MDQwWjB5MQswCQYDVQQGEwJGSTEQMA4GA1UECAwHVXVzaW1hYTEOMAwGA1UEBwwFRXNwb28xLzAtBgNVBAoMJkNTQyAtIFRpZXRlZW4gdGlldG90ZWtuaWlrYW4ga2Vza3VzIE95MRcwFQYDVQQDDA5zcC5rb3JwLmNzYy5maTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL0t9prsxDEUTnAnM0U2N4xsqy7t7LlO82PXSY6QWoaQbYr5VwC+YniIIU/ZPRYzR/pjqAeqsoITg+PvYu76fWEcErIYAKCSJclOV5baajaX0lJqVFs6qrfO7jzrUUntdOWoYwM0y750wP47JjPRgXt4iK8t4lQoRy1V0RwCqECMgezbWZwIfRM8ZBhtAfFIUsKwm5TSDyFNSWRMNdIurZ2tIDwrpBDe/wy0nAfNfE1GOieldJQ4IDkg3g0+GmlvGH+CWRYNxxYlfb8UgvDoBmMQsZnJ3fvWe+RyDM5euoJbKFWMkViCGTj1c/vLBGVUeqN5N1Fsjie8u63Rbr8WoxmgMdyGStjDSxE/fhVICUpB16+kRTueiLAfQKxTrAmf85Eiip3C9NITo5wzhHfA3L/WuQXS1AamABT4cQmrbbmdetjzFHAawSUuCj6xsCXW8gZ9eH3JxeYDmbWSCszK7OaAhO/ogFMBhmIagYiFERQXQ5VL5AycD75B8nLoIclkcNPeokMNyH9o8MLppmii1kIl9HJy8PKYQ43/PoxG6hHfWpyBFPY0vUmiuo3D6zxok5xFa7RBEZmHnMRGlQkQHsh9HWRGp0XONjn0I2QpENR38yZe8UMaBxBDFdcjL5Chl97gJ8lOZvXBhvBIpE20qOIxKRSsra3LOSizuxvTDTH5AgMBAAGjUDBOMB0GA1UdDgQWBBRlr/b9mFO4k03P1v1ydUnYbv1bMzAfBgNVHSMEGDAWgBRlr/b9mFO4k03P1v1ydUnYbv1bMzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBDQUAA4ICAQBxXBRhhzeEflqzGJfxaL6WcYRUY3jOxqZ9ZUeDO+z/BD6EgJzMVcKFpPZieDreTkGYdHNIxua1EAhq+CHfDZoTXoDlTMVYXWALZ7U5+8BRLMWxrSTv253jUbIB09y4FRFE6VrU5l521V3I/wuibn89nwiiXxzVEqjIaKoN5cZTbelBrJ2c2FGpXjrc9BhkDaGfvDU/EGRdFtG9twRa3T9KEhOnkR7eNPoswP0wNPvGgZeVtwVgxVXk5RdJyn/UWsW7S+cO/fUcUj9afi9Ckf8/noLhkyb4a1zAyvoTR9hg3F4PzxnZcTd0yBPZBtnReIfAe+XMwyucYKC2rHnnPDigHtIEROelK8+gjBwsJmMeTEjjpcjLYgRCfjbw5R3bVxmYUIeQAN//Jn3PqoHMMRuuwCXvSlYhquAi5AxKUExhBGy4YpHjQPlnybd0Yhszo1I3ERIMtpI7luDDDTWqElZDIfM/QFt/2bD308OHm/ZmM5nS8+smrt5Ms6WqmvyetYXddlZF+Lujdcl+h2rRBICt27C0640ewl5a+RYAfS1/pt1VbvAcLpYvAOGyEPVLJuYU5YCqqrc+YNVWj+3oWPY1l3/3zdNp0ntT1tB6ZhAiTGE/jwMDajxN++AjIHvz0SxDyCbue9Ub8H4+YdK6URY9QtQGeaYTJGm/3xWFWpuyZQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIFxzCCA6+gAwIBAgIJAPpACXfu18aIMA0GCSqGSIb3DQEBDQUAMHkxCzAJBgNVBAYTAkZJMRAwDgYDVQQIDAdVdXNpbWFhMQ4wDAYDVQQHDAVFc3BvbzEvMC0GA1UECgwmQ1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMgT3kxFzAVBgNVBAMMDnNwLmtvcnAuY3NjLmZpMCAXDTE4MTIyMTExNTA0MFoYDzk5OTkxMjMxMTE1MDQwWjB5MQswCQYDVQQGEwJGSTEQMA4GA1UECAwHVXVzaW1hYTEOMAwGA1UEBwwFRXNwb28xLzAtBgNVBAoMJkNTQyAtIFRpZXRlZW4gdGlldG90ZWtuaWlrYW4ga2Vza3VzIE95MRcwFQYDVQQDDA5zcC5rb3JwLmNzYy5maTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL0t9prsxDEUTnAnM0U2N4xsqy7t7LlO82PXSY6QWoaQbYr5VwC+YniIIU/ZPRYzR/pjqAeqsoITg+PvYu76fWEcErIYAKCSJclOV5baajaX0lJqVFs6qrfO7jzrUUntdOWoYwM0y750wP47JjPRgXt4iK8t4lQoRy1V0RwCqECMgezbWZwIfRM8ZBhtAfFIUsKwm5TSDyFNSWRMNdIurZ2tIDwrpBDe/wy0nAfNfE1GOieldJQ4IDkg3g0+GmlvGH+CWRYNxxYlfb8UgvDoBmMQsZnJ3fvWe+RyDM5euoJbKFWMkViCGTj1c/vLBGVUeqN5N1Fsjie8u63Rbr8WoxmgMdyGStjDSxE/fhVICUpB16+kRTueiLAfQKxTrAmf85Eiip3C9NITo5wzhHfA3L/WuQXS1AamABT4cQmrbbmdetjzFHAawSUuCj6xsCXW8gZ9eH3JxeYDmbWSCszK7OaAhO/ogFMBhmIagYiFERQXQ5VL5AycD75B8nLoIclkcNPeokMNyH9o8MLppmii1kIl9HJy8PKYQ43/PoxG6hHfWpyBFPY0vUmiuo3D6zxok5xFa7RBEZmHnMRGlQkQHsh9HWRGp0XONjn0I2QpENR38yZe8UMaBxBDFdcjL5Chl97gJ8lOZvXBhvBIpE20qOIxKRSsra3LOSizuxvTDTH5AgMBAAGjUDBOMB0GA1UdDgQWBBRlr/b9mFO4k03P1v1ydUnYbv1bMzAfBgNVHSMEGDAWgBRlr/b9mFO4k03P1v1ydUnYbv1bMzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBDQUAA4ICAQBxXBRhhzeEflqzGJfxaL6WcYRUY3jOxqZ9ZUeDO+z/BD6EgJzMVcKFpPZieDreTkGYdHNIxua1EAhq+CHfDZoTXoDlTMVYXWALZ7U5+8BRLMWxrSTv253jUbIB09y4FRFE6VrU5l521V3I/wuibn89nwiiXxzVEqjIaKoN5cZTbelBrJ2c2FGpXjrc9BhkDaGfvDU/EGRdFtG9twRa3T9KEhOnkR7eNPoswP0wNPvGgZeVtwVgxVXk5RdJyn/UWsW7S+cO/fUcUj9afi9Ckf8/noLhkyb4a1zAyvoTR9hg3F4PzxnZcTd0yBPZBtnReIfAe+XMwyucYKC2rHnnPDigHtIEROelK8+gjBwsJmMeTEjjpcjLYgRCfjbw5R3bVxmYUIeQAN//Jn3PqoHMMRuuwCXvSlYhquAi5AxKUExhBGy4YpHjQPlnybd0Yhszo1I3ERIMtpI7luDDDTWqElZDIfM/QFt/2bD308OHm/ZmM5nS8+smrt5Ms6WqmvyetYXddlZF+Lujdcl+h2rRBICt27C0640ewl5a+RYAfS1/pt1VbvAcLpYvAOGyEPVLJuYU5YCqqrc+YNVWj+3oWPY1l3/3zdNp0ntT1tB6ZhAiTGE/jwMDajxN++AjIHvz0SxDyCbue9Ub8H4+YdK6URY9QtQGeaYTJGm/3xWFWpuyZQ==</X509Certificate>
+          <X509Certificate>MIIFxzCCA6+gAwIBAgIJAPpACXfu18aIMA0GCSqGSIb3DQEBDQUAMHkxCzAJBgNV BAYTAkZJMRAwDgYDVQQIDAdVdXNpbWFhMQ4wDAYDVQQHDAVFc3BvbzEvMC0GA1UE CgwmQ1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMgT3kxFzAVBgNV BAMMDnNwLmtvcnAuY3NjLmZpMCAXDTE4MTIyMTExNTA0MFoYDzk5OTkxMjMxMTE1 MDQwWjB5MQswCQYDVQQGEwJGSTEQMA4GA1UECAwHVXVzaW1hYTEOMAwGA1UEBwwF RXNwb28xLzAtBgNVBAoMJkNTQyAtIFRpZXRlZW4gdGlldG90ZWtuaWlrYW4ga2Vz a3VzIE95MRcwFQYDVQQDDA5zcC5rb3JwLmNzYy5maTCCAiIwDQYJKoZIhvcNAQEB BQADggIPADCCAgoCggIBAL0t9prsxDEUTnAnM0U2N4xsqy7t7LlO82PXSY6QWoaQ bYr5VwC+YniIIU/ZPRYzR/pjqAeqsoITg+PvYu76fWEcErIYAKCSJclOV5baajaX 0lJqVFs6qrfO7jzrUUntdOWoYwM0y750wP47JjPRgXt4iK8t4lQoRy1V0RwCqECM gezbWZwIfRM8ZBhtAfFIUsKwm5TSDyFNSWRMNdIurZ2tIDwrpBDe/wy0nAfNfE1G OieldJQ4IDkg3g0+GmlvGH+CWRYNxxYlfb8UgvDoBmMQsZnJ3fvWe+RyDM5euoJb KFWMkViCGTj1c/vLBGVUeqN5N1Fsjie8u63Rbr8WoxmgMdyGStjDSxE/fhVICUpB 16+kRTueiLAfQKxTrAmf85Eiip3C9NITo5wzhHfA3L/WuQXS1AamABT4cQmrbbmd etjzFHAawSUuCj6xsCXW8gZ9eH3JxeYDmbWSCszK7OaAhO/ogFMBhmIagYiFERQX Q5VL5AycD75B8nLoIclkcNPeokMNyH9o8MLppmii1kIl9HJy8PKYQ43/PoxG6hHf WpyBFPY0vUmiuo3D6zxok5xFa7RBEZmHnMRGlQkQHsh9HWRGp0XONjn0I2QpENR3 8yZe8UMaBxBDFdcjL5Chl97gJ8lOZvXBhvBIpE20qOIxKRSsra3LOSizuxvTDTH5 AgMBAAGjUDBOMB0GA1UdDgQWBBRlr/b9mFO4k03P1v1ydUnYbv1bMzAfBgNVHSME GDAWgBRlr/b9mFO4k03P1v1ydUnYbv1bMzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 DQEBDQUAA4ICAQBxXBRhhzeEflqzGJfxaL6WcYRUY3jOxqZ9ZUeDO+z/BD6EgJzM VcKFpPZieDreTkGYdHNIxua1EAhq+CHfDZoTXoDlTMVYXWALZ7U5+8BRLMWxrSTv 253jUbIB09y4FRFE6VrU5l521V3I/wuibn89nwiiXxzVEqjIaKoN5cZTbelBrJ2c 2FGpXjrc9BhkDaGfvDU/EGRdFtG9twRa3T9KEhOnkR7eNPoswP0wNPvGgZeVtwVg xVXk5RdJyn/UWsW7S+cO/fUcUj9afi9Ckf8/noLhkyb4a1zAyvoTR9hg3F4PzxnZ cTd0yBPZBtnReIfAe+XMwyucYKC2rHnnPDigHtIEROelK8+gjBwsJmMeTEjjpcjL YgRCfjbw5R3bVxmYUIeQAN//Jn3PqoHMMRuuwCXvSlYhquAi5AxKUExhBGy4YpHj QPlnybd0Yhszo1I3ERIMtpI7luDDDTWqElZDIfM/QFt/2bD308OHm/ZmM5nS8+sm rt5Ms6WqmvyetYXddlZF+Lujdcl+h2rRBICt27C0640ewl5a+RYAfS1/pt1VbvAc LpYvAOGyEPVLJuYU5YCqqrc+YNVWj+3oWPY1l3/3zdNp0ntT1tB6ZhAiTGE/jwMD ajxN++AjIHvz0SxDyCbue9Ub8H4+YdK6URY9QtQGeaYTJGm/3xWFWpuyZQ==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Korp – search service for text material</ServiceName>
-      <ServiceName xml:lang="nl">Korp – search service for text material</ServiceName>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Korp - hakuohjelma tekstiaineistoille</ServiceName>
+      <ServiceName xml:lang="en">Korp - search service for text material</ServiceName>
+      <ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</ServiceDescription>
       <ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</ServiceDescription>
-      <ServiceDescription xml:lang="nl">Dienst voor het bestuderen van tekstcorpora (Het aanvragen van deze dienst is automatisch een aanvraag voor alle Clarin diensten)</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonAffiliation"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
     <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="nl">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Krister</GivenName>
@@ -56,12 +66,12 @@
   <ContactPerson contactType="technical">
     <GivenName>Martin</GivenName>
     <SurName>Matthiesen</SurName>
-    <EmailAddress>mailto:ling-admin@listat.csc.fi</EmailAddress>
+    <EmailAddress>mailto:kielipankki@csc.fi</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Tero</GivenName>
     <SurName>Aalto</SurName>
-    <EmailAddress>mailto:ling-admin@listat.csc.fi</EmailAddress>
+    <EmailAddress>mailto:kielipankki@csc.fi</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Jyrki</GivenName>