--- DFN-AAI/https%3A%2F%2Flbr.csc.fi%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Flbr.csc.fi%2Fshibboleth.xml
@@ -1,71 +1,66 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lbr.csc.fi/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2023-03-03T09:40:12Z">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/fileadmin/documents/mrps_dfn-aai_1.0.pdf</RegistrationPolicy>
+    <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://refeds.org/category/research-and-scholarship</AttributeValue>
         <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
         <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
-      </Attribute>
-      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>none</AttributeValue>
       </Attribute>
     </EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">Language Bank Rights</DisplayName>
+        <DisplayName xml:lang="fi">Kielipankin oikeudet</DisplayName>
         <DisplayName xml:lang="en">Language Bank Rights</DisplayName>
-        <Description xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</Description>
+        <Description xml:lang="fi">Palvelu Kielipankin kielivarojen käyttölupien hakemiseen ja hallintaan.</Description>
         <Description xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</Description>
         <PrivacyStatementURL xml:lang="en">https://lbr.csc.fi/privacy-policy.html</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="fi">https://lbr.csc.fi/privacy-policy.html</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>lbr.csc.fi</KeyName>
         <X509Data>
-          <X509SubjectName>CN=lbr.csc.fi,O=CSC - Tieteen tietotekniikan keskus Oy,L=Espoo,ST=Uusimaa,C=FI</X509SubjectName>
           <X509Certificate>MIIFvzCCA6egAwIBAgIJAOIdfsT10+MPMA0GCSqGSIb3DQEBDQUAMHUxCzAJBgNV BAYTAkZJMRAwDgYDVQQIDAdVdXNpbWFhMQ4wDAYDVQQHDAVFc3BvbzEvMC0GA1UE CgwmQ1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMgT3kxEzARBgNV BAMMCmxici5jc2MuZmkwIBcNMTkwNTI5MTExNzI5WhgPOTkwNDA3MzExMTE3Mjla MHUxCzAJBgNVBAYTAkZJMRAwDgYDVQQIDAdVdXNpbWFhMQ4wDAYDVQQHDAVFc3Bv bzEvMC0GA1UECgwmQ1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMg T3kxEzARBgNVBAMMCmxici5jc2MuZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw ggIKAoICAQC1/iqwa3OYOxJk0EAjjyGGGHsB2o1oENf4ReUOUSNrfIf6o92Ir2QU /WA0PXuB/RkPY8/bpkHt97hT5RbNBC01DCQcN4MwkVWoc6iHfA7Ve5YXAUa9BCgl JeIdoO2taY6jlyAlgziR6mkXpv/sNXS/xpDukhS6cD3Rh5hOfYCb3qRPjlZaXZlx F8gUcp5M3pPgEQ5c5tfNTAB+Z6u44jmY8OZGgSBK1VliMGRYscm+1+xRxpVqGhkD 8WXo54aibZQp/uJ5jUokadTjfam00AWIPEPKsV8erytgXFnXELHFy4XnAUsRgM/w 66NnBuoEvhbiFf5tjH8NydyxX5cbf956YPYGpv5E6+k4Oys/qjRAQmRLeqaYVS3o U7DQCJnVlelcDL2NOofTtrRDf2YAfZKPvj8dtbvwf4PLzHzT/uyE9Y0qTez6fVyI VVPWtTK7VO/noKvknTdhULSDNM7oQmK4mLQWWmts7mAZH3UUkIj6n+eCvlYP1l2Z 5TXzdurekV9pm6bMaNFjrM1RnF7XBTj7LSAnYB6MJapj+leKH7ckaXUg6RBi0PVo tN9ETDDqa6t63Gzb72Tt6hCCqNwVLed7/kAKNJXpbZfAaSrxMxrm3m6Cf05AYnmB QbvTNUAtr6lPQa623kbr/nCxfuWMlc5JSW63VSXLo5OY/F4cCkVE5QIDAQABo1Aw TjAdBgNVHQ4EFgQUq69/0rj7bDPj/q+vcTy3yNlDmNcwHwYDVR0jBBgwFoAUq69/ 0rj7bDPj/q+vcTy3yNlDmNcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQ0FAAOC AgEAK5C/qgPHsxfKAPYimcyvbS7+o9UBjvDU2t+Y8dpGtxB8VbRS2RjcNOeRMC2a IXUNkwxFOb34B8W5mBMMDIgtRUD5EMnbAC7Ssmx4awXMiY4F4xA/qCxpxeXasIUH 96blP2As5HV1RupwMOGXpheo1rYU9rU5ENWKe6NEaXi35YceynYsj4xVUcVLJ3nF tDRV7rtngfONc/lFZEML6dUDaGKfd0hJIfDFtLuToFFzreWqjQ/lLr/7+lecYyA6 HZfAhHUKwTGq0iZFR8l4u3dn7zSvtPEJ7BdQxtSTVOkTX/8zm0SoKnI3ssWvu04n we7tA+3AczlfZ9CtMdb9Aljkpnlw6LxK4V5OPn0iOSEaxc+ErD9G08RaEgZMURtu 4/lmHxkVCpzsooSe8hqMdwmEXHHFT+l+kMcacc2z76YQfgQs5rU74y2rHHCPWWDk ZtA23/t6w2soLJSTRKuvAT6wr0LLzNdmrRGEwU3ENMsyvWdv4XK1ZHfMRQZX4IWU 35FPHqXVVvJrqhTZwaI86WeQ+CrQvhPpUE+WvsPJPOaP88iKTk/nHRxFj/Shn87W tpbw1xxTSJJuCzZ6kT0y9eDezDok0t2YVTX+mFsMITB2vf3QZbh4uS71TwwLYoxt Uh6tNDNY0A3PNpCBGOgwW8FKeNCD6Wpovm8ZTD5DbZ9x5DU=</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lbr.csc.fi/Shibboleth.sso/SLO/Redirect"/>
     <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://lbr.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Language Bank Rights</ServiceName>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lbr.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Kielipankin oikeudet</ServiceName>
       <ServiceName xml:lang="en">Language Bank Rights</ServiceName>
-      <ServiceDescription xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</ServiceDescription>
+      <ServiceDescription xml:lang="fi">Palvelu Kielipankin kielivarojen kayttolupien hakemiseen ja hallintaan.</ServiceDescription>
       <ServiceDescription xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</ServiceDescription>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e459</OrganizationName>
-    <OrganizationName xml:lang="en">e459</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://clarin.eu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">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="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>Martin</GivenName>
-    <SurName>Matthiesen</SurName>
-    <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
     <GivenName>Martin</GivenName>
     <SurName>Matthiesen</SurName>
     <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
@@ -75,4 +70,9 @@
     <SurName>Mustonen</SurName>
     <EmailAddress>mailto:rems@csc.fi</EmailAddress>
   </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Martin</GivenName>
+    <SurName>Matthiesen</SurName>
+    <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>