--- ACOnet/https%3A%2F%2Fka3.uni-koeln.de.xml
+++ CLARIN IdP/https%3A%2F%2Fka3.uni-koeln.de.xml
@@ -1,18 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ka3.uni-koeln.de">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2018-10-08T10:45:03Z">
-      <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>
+      </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>
+      </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>
-      </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>
@@ -26,16 +23,14 @@
         <Description xml:lang="de">Kölner Zentrum Archivierung und Analyse von AV-Daten</Description>
         <Description xml:lang="en">Cologne Center Archiving and Analysis of AV-Data</Description>
         <InformationURL xml:lang="de">https://ka3.uni-koeln.de</InformationURL>
+        <InformationURL xml:lang="en">https://ka3.uni-koeln.de</InformationURL>
         <Logo height="170" width="300">https://ka3.uni-koeln.de/static/uco.png</Logo>
-        <InformationURL xml:lang="en">https://ka3.uni-koeln.de</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://ka3.uni-koeln.de/home/privacyStatement</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>ka3.uni-koeln.de</KeyName>
         <X509Data>
-          <X509SubjectName>CN=ka3.uni-koeln.de,O=Universität zu Köln,ST=Nordrhein-Westfalen,C=DE</X509SubjectName>
           <X509Certificate>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 w62VNq/ItcQsG26Fcg==</X509Certificate>
         </X509Data>
       </KeyInfo>
@@ -43,48 +38,49 @@
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ka3.uni-koeln.de/saml/SingleLogout"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ka3.uni-koeln.de/saml/SingleLogout"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ka3.uni-koeln.de/saml/SingleLogout"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <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://ka3.uni-koeln.de/saml/SSO" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ka3.uni-koeln.de/saml/SSO" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ka3.uni-koeln.de/saml/SSO" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ka3.uni-koeln.de/saml/SSO" index="2"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">KA³ Köln</ServiceName>
-      <ServiceName xml:lang="en">KA³ Cologne</ServiceName>
+      <ServiceName xml:lang="de">KA³</ServiceName>
+      <ServiceName xml:lang="en">KA³</ServiceName>
       <ServiceDescription xml:lang="de">Kölner Zentrum Archivierung und Analyse von AV-Daten</ServiceDescription>
       <ServiceDescription xml:lang="en">Cologne Center Archiving and Analysis of AV-Data</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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <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="false"/>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </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="de">RRZK</OrganizationName>
+    <OrganizationName xml:lang="en">RRZK</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Regionales Rechenzentrum der Universität zu Köln (RRZK)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Regional Computing Centre, University of Cologne (RRZK)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">https://rrzk.uni-koeln.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://rrzk.uni-koeln.de</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Beate</GivenName>
-    <SurName>Schlesiona</SurName>
-    <EmailAddress>mailto:bschlesi@uni-koeln.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:refeds="http://refeds.org/metadata" contactType="other" refeds:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Diensteentwicklung</GivenName>
-    <EmailAddress>mailto:diensteentwicklung-rrzk@uni-koeln.de</EmailAddress>
+  <ContactPerson contactType="technical">
+    <GivenName>Robert</GivenName>
+    <SurName>Kummer</SurName>
+    <EmailAddress>mailto:kummer@uni-koeln.de</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Diensteentwicklung</GivenName>
     <SurName>RRZK</SurName>
     <EmailAddress>mailto:diensteentwicklung-rrzk@uni-koeln.de</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Kummer</SurName>
-    <EmailAddress>mailto:kummer@uni-koeln.de</EmailAddress>
+  <ContactPerson contactType="administrative">
+    <GivenName>Beate</GivenName>
+    <SurName>Schlesiona</SurName>
+    <EmailAddress>mailto:bschlesi@uni-koeln.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <GivenName>Diensteentwicklung</GivenName>
+    <EmailAddress>mailto:diensteentwicklung-rrzk@uni-koeln.de</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>