--- DFN-AAI/https%3A%2F%2Fb2access.eudat.eu%3A8443%2Funitygw%2Fsaml-sp-metadata.xml
+++ CLARIN IdP/https%3A%2F%2Fb2access.eudat.eu%3A8443%2Funitygw%2Fsaml-sp-metadata.xml
@@ -1,32 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://b2access.eudat.eu:8443/unitygw/saml-sp-metadata">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-22T13:13:53Z">
-      <RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</RegistrationPolicy>
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</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>
-      </Attribute>
-      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>https://refeds.org/sirtfi</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>
+        <AttributeValue>http://clarin.eu/category/clarin-member</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">EUDAT B2ACCESS</DisplayName>
         <DisplayName xml:lang="en">EUDAT B2ACCESS</DisplayName>
-        <Description xml:lang="de">AAI für EUDAT B2-Services</Description>
         <Description xml:lang="en">AAI for EUDAT B2-Services</Description>
+        <Logo height="16" width="16">https://b2access.eudat.eu/unitygw/VAADIN/files/logo-small.png</Logo>
+        <Logo height="146" width="146">https://b2access.eudat.eu/unitygw/VAADIN/files/logo-huge.png</Logo>
         <InformationURL xml:lang="en">https://b2access.eudat.eu/unitygw/VAADIN/files/about-b2access.html</InformationURL>
-        <Logo height="146" width="146">https://b2drop.eudat.eu/s/H85AxdLYzZkE7kF/download</Logo>
         <PrivacyStatementURL xml:lang="en">https://b2access.eudat.eu/unitygw/VAADIN/files/data-privacy-statement.html</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
@@ -34,47 +24,43 @@
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <KeyName>b2access.eudat.eu</KeyName>
         <X509Data>
-          <X509SubjectName>CN=b2access.eudat.eu,O=CSC-Tieteen tietotekniikan keskus Oy,L=Espoo,ST=Uusimaa,C=FI</X509SubjectName>
-          <X509Certificate>MIIFezCCA2MCFAIu/Ui6jrh1hjw5o7ENxZaUPpmXMA0GCSqGSIb3DQEBCwUAMHox CzAJBgNVBAYTAkZJMRAwDgYDVQQIDAdVdXNpbWFhMQ4wDAYDVQQHDAVFc3BvbzEt MCsGA1UECgwkQ1NDLVRpZXRlZW4gdGlldG90ZWtuaWlrYW4ga2Vza3VzIE95MRow GAYDVQQDDBFiMmFjY2Vzcy5ldWRhdC5ldTAeFw0yMjA1MzAxMTU1MzdaFw0yNTA1 MjkxMTU1MzdaMHoxCzAJBgNVBAYTAkZJMRAwDgYDVQQIDAdVdXNpbWFhMQ4wDAYD VQQHDAVFc3BvbzEtMCsGA1UECgwkQ1NDLVRpZXRlZW4gdGlldG90ZWtuaWlrYW4g a2Vza3VzIE95MRowGAYDVQQDDBFiMmFjY2Vzcy5ldWRhdC5ldTCCAiIwDQYJKoZI hvcNAQEBBQADggIPADCCAgoCggIBAM+OGzgErlbDFXCRak9beBIar3qAT9aox0Mj +Kw2VbrsN0bHvde7c2ufw79mDL3Pp5K0Q3xJm9m6EWTsIQVByhKOaccNP8WLgeDa uW+A1aSLTjbJxDuTa9S/E03YCkWcjvUoLp0M4pdMoPCzXWYVN+sR9iygoQjL/CB/ sTBypkImNz//hN9Pimg42vN9XwBUmlD9OWJlV7Dx3LLC5/S/w77YdeVEllYgs/CU WtzVYT3ZSlITeARn186w/o5FFYIhTR3yQme4gEJL1P26sCpktqFU3WFNmm+/o7ED njrcMYzVhpyl28HRXu1Xhm3ph6Lpesip92SCF1Zwhxm73Qk+OmWH+8ljBwVszqGE Gxyz7ecm8dSChkBxhfbaE4upSjxYfAKmFZbnaQXLfQh7a90DP4whFDq6vzP0os8w 9bEVIu5wDCgidX/c0x9abiUtLf+DND04xi9gJWWtJbQzCVnsLPzbRSxOm+mFz4Wq LFrNdqoUB9DDKGhNdPTzgBokqK8vQK//o1iNgWKZyA5KwU+yPmawZo0iKHIvdq1V al+qUZtG30hNR9SegMzFEHKOkDsXmnYryhzceAGNONv68rLiGmCzAPz1x7jz5s93 lnUm/1/1BsHIrxC81w/ZNrU3EXzj1pQtrYJqkNHfaVWFHWVvBVckI9PAq1/AiTOo PuKwwODfAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAHiRhM4B5d9LBUEtnayVDIUl itsIWvIu+EUPAmzCdjpZEuMzn9i81n/anOlj5zjMt/5LnLMrF4GMSAXCo7xukS38 ozuBzK47NT+g6h+DI69FGqnnTE+GC5dCYbtO7ApwD+K+TxXJElSE6XGUtT+EfDLC GsxCh4g71AjwrmMHBDqItWT7dgZsPGZo7PAFV6c1Hge123isKrwDzQJukXTRyt1M 18CxsbZxjfOnlZ9XID0xYrH3bcDWWQvi5CqvLhI5gpiwCym/y/m4uEwlj8e91ut4 WN06zWByXmun2XShJGwVa3mmBK6d2zOLwZtFZKdhkyddD8K/9mxWJERmjThp5ip1 w+Md0xKdP7gCOmr5u2XnDkPgzO3pIh33sfo4dvh/RwouK06vvTuwWBm+5w7RJeBU qDJDFd+V9oTzxIglwObHzGe1Gk4/OxxWcbMRnR7qFElHxfCFA12KUiWVSv+sdNbb +x9t5zQYB08CbO6+jPDX6ZkZRwb8pKquKwjdx/2wzG2b7GpLM/0/TA2Q1118DCMm On2dpnK2xgyuP/sD8vWm0NkTElIDHOR/H/eWAp4IMfKOoYgPkRIsBIqi4fXBUoCj EeE3Q3g6yP6+MnFi7/QyBbhVsik/Wjlb4p2Z0rDtgywsg7oXKZYFtkQE8XPQZvhN eFu2S4hADEl/f+wse1VL</X509Certificate>
+          <X509SubjectName>CN=b2access.eudat.eu,O=CSC - Tieteen tietotekniikan keskus Oy,L=Espoo,C=FI</X509SubjectName>
+          <X509Certificate>MIIHpjCCBo6gAwIBAgIQBA2aBU1Sk+bZwPY5Ixr3nDANBgkqhkiG9w0BAQsFADBk MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg Q0EgMzAeFw0xODA3MDUwMDAwMDBaFw0yMDA3MDkxMjAwMDBaMGoxCzAJBgNVBAYT AkZJMQ4wDAYDVQQHEwVFc3BvbzEvMC0GA1UEChMmQ1NDIC0gVGlldGVlbiB0aWV0 b3Rla25paWthbiBrZXNrdXMgT3kxGjAYBgNVBAMTEWIyYWNjZXNzLmV1ZGF0LmV1 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAy5yKdHUPFmaLq6cGyUDH SrM9zibkqX8s/FVdwwpnfJdl6abNquelP6/Td0mFIqu2XNyD0HzVUxZ+DZb25dOc wLqBGdpBdN8Z0faVsx3acwJXofium/7D/2xdyjC31LkQE7IyZcQZiB8qU8kNwRKD oBFiv6D2nYouRxDkXeqYnYnl70Of6+Nt/VwNtTrtcb/gS4BsMZtCRSM3VGcHjs2l fxF9imBmtcmM6p27U+QtoqQCcUgDojqUkJgVNo7+KrjjWfePBOpkWlMFqm+MV3Lb Hyngb9KB8MKXbOL5xsDBgn0u77voLIgsEBydlNwC5oAR0t2+lcoxPRPs4g7ZCCZN GgAG/gkMZ52i4B0JGonSAjB5lh4VOZkvRH6sv1ipzbJ3OQEm88zYUd01qSG2ljQl PCL63S/Sh+m4Z+YZN9Cb4UEgOOw/E3QJRpqGonOshAFwMrjjXZsxVcVdcN9Y6HpL xs0gnJS/M01+cL8H0oFmIyul3swXud1vNjwuCBj/dO+NuLXYFD+bZQaJ3i5TAgVP /2zexEwq8i1yQikijNI7VAkIQGSG5tdhqt7buk+np7j9EULmiaB/U0evMCHlCd2t ttCU5zhiFuwkHbG0oMCYB5LUoRTCSzUoNLD8bmEKIQb+ScYx4cwuQZqPBPdysHbJ cEeTybcY1GgIDv4IRP5F7+ECAwEAAaOCA0wwggNIMB8GA1UdIwQYMBaAFGf9iCAU J5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBSzYi6A2YUjF0CcM2eicXIHwORgMTAc BgNVHREEFTATghFiMmFjY2Vzcy5ldWRhdC5ldTAOBgNVHQ8BAf8EBAMCBaAwHQYD VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0 dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilo dHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAE RTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdp Y2VydC5jb20vQ1BTMAgGBmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUH MAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDov L2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/ BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHcA7ku9t3XOYLrhQmkfq+Ge ZqMPfl+wctiDAMR7iXqo/csAAAFkakBVGwAABAMASDBGAiEAqu6Y06tWu7sHInEW OyFWDxqqw/6iBsh5BWkmXHtGyDYCIQCj4n0I0xH24QR0dufxxEMQ7Ph3dth1pMcm BGstsvXvJAB2AId1v+dZfPiMQ5lfvfNu/1aNR1Y2/0q1YMG06v9eoIMPAAABZGpA VRoAAAQDAEcwRQIgeNkb8rxZbS+2f5jC+QRfVB90unsmxm8A3npObQaM4zkCIQCf V61dvZ8armVqOVlP4Hpn/VpV/T4rU1cn5m2HEB4csgB1ALvZ37wfinG1k5Qjl6qS e0c4V5UKq1LoGpCWZDaOHtGFAAABZGpAVTwAAAQDAEYwRAIgbyAdkqMNhUzvKegP MoF5WFODcg7B2EhO0h+y9Z5tsdACIDmAqGOgGQMIm+zB/CYHE5dAFpH7UTjRf7OV Eez3BbS+MA0GCSqGSIb3DQEBCwUAA4IBAQAwpJdt6ym1gp3v2MagSrZRSxSyir1n ZLIuZOiu1fVgqZbC922mb7pyIP7xVraAL5uhigJZN0O4/1CdYUOhncvWvNs/aKzG lS1VEcubk2STaTCPlocZ3awEGwvkOPHYDfEuhUckEJaHEMNhsWCbRz+ctYtYZK3H MDdLVFD81NaSKL3gcdUP7v06W2UlbixsDyyGx5Sv0WgxFXeNLWCbw0ISwI/5yZGh UYx2VarmFiLCDLaK3MWCtlaXXaRuaq1kdh/tUgS/ccqfXdLYsXziGYMVlsIWqD3B k9E9QwfR6b/E+kHMWiclonDWYOTmRktRi7F3PLf/Ke+tnARMLn2xTurX</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <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://b2access.eudat.eu/unitygw/spSAMLResponseConsumer" index="1"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">EUDAT B2ACCESS</ServiceName>
       <ServiceName xml:lang="en">EUDAT B2ACCESS</ServiceName>
-      <ServiceDescription xml:lang="de">AAI für EUDAT B2-Services</ServiceDescription>
       <ServiceDescription xml:lang="en">AAI for EUDAT B2-Services</ServiceDescription>
+      <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="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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="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" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e234</OrganizationName>
-    <OrganizationName xml:lang="en">e234</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fz-juelich.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fz-juelich.de</OrganizationURL>
+    <OrganizationName xml:lang="en">EUDAT</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">EUDAT</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.eudat.eu/</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>EUDAT</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:b2access-support@eudat.eu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>EUDAT</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:b2access-support@eudat.eu</EmailAddress>
+  </ContactPerson>
   <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>Security Response</GivenName>
     <SurName>Team</SurName>
     <EmailAddress>mailto:cert@fz-juelich.de</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>B2ACCESS</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:ds-support@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>B2ACCESS</GivenName>
-    <SurName>Technical</SurName>
-    <EmailAddress>mailto:ds-support@fz-juelich.de</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>