--- eduGAIN/https%3A%2F%2Fsp.onderzoek.zoeken.fame.frl%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.onderzoek.zoeken.fame.frl%2Fshibboleth.xml
@@ -1,31 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.onderzoek.zoeken.fame.frl/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2019-01-17T12:25:05Z">
-      <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://clarin.eu/category/clarin-member</AttributeValue>
         <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>
+      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">CLST Fame</DisplayName>
+        <Description xml:lang="en">Web services and web applications developed and/or maintained by the Centre of Language and Speech technology at the Radboud University.</Description>
+        <DisplayName xml:lang="nl">Centre for Language and Speech Technology webservices en webapplicaties</DisplayName>
+        <Description xml:lang="nl">Webservices en webapplicaties ontwikkeld en/of onderhouden door het Centre of Language and Speech technology, van de Radboud Universiteit</Description>
+        <Logo height="44" width="249">https://applejack.science.ru.nl/clst.png</Logo>
+        <InformationURL xml:lang="en">https://webservices.cls.ru.nl/</InformationURL>
+        <Keywords xml:lang="en">CLST Centre+for+Language+and+Speech+Technology NLP Natural+Language+Processing Language+Technology RU Radboud+University Text+mining Computational+linguistics Corpora</Keywords>
+        <Keywords xml:lang="nl">CLST Centre+for+Language+and+Speech+Technology NLP Natural+Language+Processing Taaltechnologie RU Radboud+Universiteit Text+mining Computationele+taalkunde Corpora</Keywords>
+        <PrivacyStatementURL xml:lang="en">https://applejack.science.ru.nl/privacy.html</PrivacyStatementURL>
+      </UIInfo>
       <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/Login"/>
       <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://onderzoek.zoeken.fame.frl/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">CLST Fame</DisplayName>
-        <DisplayName xml:lang="en">CLST Fame</DisplayName>
-        <Description xml:lang="de">Web services and web applications developed and/or maintained by the Centre of Language and Speech technology at the Radboud University.</Description>
-        <Description xml:lang="en">Web services and web applications developed and/or maintained by the Centre of Language and Speech technology at the Radboud University.</Description>
-        <InformationURL xml:lang="en">https://webservices-lst.science.ru.nl/portal/</InformationURL>
-        <Logo height="44" width="249">https://applejack.science.ru.nl/clst.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://applejack.science.ru.nl/privacy.html</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -37,19 +35,17 @@
       </KeyInfo>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/SOAP"/>
     <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://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/ECP" index="4"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">CLST Fame</ServiceName>
       <ServiceName xml:lang="en">CLST Fame</ServiceName>
-      <ServiceDescription xml:lang="de">Web services and web applications developed and/or maintained by the Centre of Language and Speech technology at the Radboud University.</ServiceDescription>
       <ServiceDescription xml:lang="en">Web services and web applications developed and/or maintained by the Centre of Language and Speech technology at the Radboud University.</ServiceDescription>
       <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="false"/>
       <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
@@ -57,12 +53,9 @@
     </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="en">Radboud University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Radboud University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.ru.nl/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Henk</GivenName>