--- ACOnet/https%3A%2F%2Fshibboleth.bbaw.de%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fshibboleth.bbaw.de%2Fshibboleth.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bbaw.de/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-03-13T16:23:00Z">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</RegistrationPolicy>
-      <RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</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>
+      </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://aai.dfn.de/require-loa/degree-of-reliance" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>basic</AttributeValue>
+      <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>
     </EntityAttributes>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <Extensions>
       <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.bbaw.de/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://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
@@ -25,26 +22,18 @@
         <DisplayName xml:lang="en">BBAW - CLARIN services</DisplayName>
         <Description xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</Description>
         <Description xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</Description>
+        <Keywords xml:lang="en">BBAW Linguistic Services</Keywords>
+        <Keywords xml:lang="nl">BBAW Linguistische Dienste</Keywords>
         <Logo height="104" width="234">https://shibboleth.bbaw.de/bbaw_logo.png</Logo>
         <InformationURL xml:lang="de">http://www.bbaw.de</InformationURL>
         <InformationURL xml:lang="en">http://www.bbaw.de</InformationURL>
-        <PrivacyStatementURL xml:lang="en">https://shibboleth.bbaw.de/index.html</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="en">http://shibboleth.bbaw.de/privacy.html</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>shibboleth.bbaw.de</KeyName>
+        <KeyName>Active</KeyName>
         <X509Data>
-          <X509SubjectName>CN=shibboleth.bbaw.de,OU=DWDS,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</X509SubjectName>
-          <X509Certificate>MIIKeTCCCWGgAwIBAgIMISbbgCFBTIIBW5GtMA0GCSqGSIb3DQEBCwUAMIGNMQsw CQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVz IERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4t UEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTE5 MDYxNzA5MzE0MloXDTIxMDkxODA5MzE0MlowgZkxCzAJBgNVBAYTAkRFMQ8wDQYD VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjE8MDoGA1UECgwzQmVybGluLUJy YW5kZW5idXJnaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNjaGFmdGVuMQ0wCwYD VQQLDAREV0RTMRswGQYDVQQDDBJzaGliYm9sZXRoLmJiYXcuZGUwggIiMA0GCSqG SIb3DQEBAQUAA4ICDwAwggIKAoICAQCowdi9sgqVGY2oGF8AL3ASt2s1Ynp182JE Qzbl8ZF+PN0nuGhqg1M+cPXpaacWI37uvJsBDWT0+KeLN8uVwyc0byhtrPz3tEZo YzpvDdtAp9SMl+RbaIIt/QDv2iGomnBSQbN4Psm5M1Y4IOiuzD6yQIQwd8m4BblA ne9rqtijy1sKlIL/EzMDa7HiogK5lJstKGrXRVxUTLSQQpNc9QgKVo2b1wiPwv9W AZ/1SMqmF0qZWT4sm2Can3/4D/ImROh33Xs/PYKPVIGaJ7hikx4fzmvR8Zj9Vlwq kL7TrGd2AjFYYCnfhpj+ihjN5msyE1YaCR8sbjs8Zj+ldPwxBfSoWhlE4enU5eU3 NsJMhdP7mmK4zdLPZCDgQDbBHKZ53soDcH7gnwEE0nhc2FHANrtMj58c5sd7mKvi 3A9VPYcrTQhnzJmFsNPFbod5xu8l7a2CrJNCmVPTgw84u525vSNRyrR8Yi0uIrec NqazWyKsgnGkL4SCs22+0iI39ny8+LCgvgpLaeOtWoRpnobdzVDQ668MfyDZ1RML qUfU6hrfM+aihwve4kIs5Qq8h6+WXSTMiVGJYZdUiOmrz7SghN2JHpQiVLy5swUy 77Mt8Whst1P89O0YGoIxlbURp/KUvyBrZkSJAhToifGrKRLk3bnVVtw/wS1q4pd2 zbZxzHml4QIDAQABo4IFyTCCBcUwVwYDVR0gBFAwTjAIBgZngQwBAgIwDQYLKwYB BAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAQBg4rBgEEAYGtIYIsAQEEBDAQBg4r BgEEAYGtIYIsAgEEBDAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFGskFA0Ml8bK66fhLfdm Q/RcLWyQMB8GA1UdIwQYMBaAFGs6mIv58lOJ2uCtsjIeCR/oqjt0MB0GA1UdEQQW MBSCEnNoaWJib2xldGguYmJhdy5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRw Oi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNy bC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2Jh bC1nMi9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYB BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJ BggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFs LWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2Nk cDIucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jYWNlcnQvY2FjZXJ0 LmNydDCCA2EGCisGAQQB1nkCBAIEggNRBIIDTQNLAHcAb1N2rDHwMRnYmQCkURX/ dxUcEdkCwQApBo2yCJo32RMAAAFrZMdLPgAABAMASDBGAiEA9ZkAAqmxQ9UMpjiH w9A2WzYqMxy1wECoixHUXoWGf8ECIQDVmvAuhtDbgQRxs/xn2ZIL20DZ/k2ZdtP5 Qc6bvVzMOAB3AKrnC388uNVmyGwvFpecn0RfaasOtFNVibL3egMBBPPNAAABa2TH S0IAAAQDAEgwRgIhANNyHEfC9/35158UjGDblWX7j9wm4eohUmHvU84IATfvAiEA 7SGLjSl6PYu9f+eTDkhgN6hQIIQIwt1bd9qcouXeXjkAdgBVgdTCFpA2AUrqC5tX PFPwwOQ4eHAlCBcvo6odBxPTDAAAAWtkx0w6AAAEAwBHMEUCIHf62sdog/gCBoxU LgOdH6FQBCowUccUV+FyVrzM9bUXAiEA6346tBoJEpVXaXhsw40s8kGTJ/85GgXS 40rL+vzcpQUAdgDuS723dc5guuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWtk x0udAAAEAwBHMEUCIQDnKZDPKLSHmO+sG9PnhtLl4oKGbthBpxkhMJ5lqDgZ0gIg NeNmwRqX+Myze5Db4WQyXO8eBS7LHCBqqcUyoNfBqWkAdwC72d+8H4pxtZOUI5eq kntHOFeVCqtS6BqQlmQ2jh7RhQAAAWtkx0uYAAAEAwBIMEYCIQC8FYApZWhyJBfy +65Y1aAmaTGFyujZ9IKseIZiJS5iMwIhAOxNwpQzb5TBJgGsbftMaF0/YGICh9TQ PdWMclk5us1WAHYApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFr ZMdLpAAABAMARzBFAiBMs69t8rl7C3JEtVbcztRtBF0xzFVjSZhnOwnMeMpfOAIh AJ9Ho9kbLbgNRz7xmYwYeV2KCFBhfzB2ArqREZUkaGsQAHYARJRlLrDuzq/EQAfY qP4owNrmgr7YyzG1P9MzlrW2gagAAAFrZMdRqgAABAMARzBFAiEAyY6ai1bPftXs bDl189rq+P3XKihwOSrIUGA5OrV3nGYCICkND8cwTmeSw9ut3G73deblNa7aR7Se J+xm0QMwcXlLMA0GCSqGSIb3DQEBCwUAA4IBAQAYYOr5SFi6EarOwm7/9etsKjaT 1wjyx2KFCfgKCvXjN109nz8DsZ4Re0FcVYvn3xTU4EDs0MjQoF4Uk15OdjNHI+5M FQfFr+W9RO8XZ+AuLa2VOeWumlSbE8AVWScbdpTLxz6i4PeutAuc+BaOpk/kPmBw 2/QG8Cr2ChUV+OGecIS+vQa1whXWB5yscwPQQZU7USsqALWVpNTEuBzuslLXuAc5 UX56/CtmVcU0zRTZP4nvW/ddZOB+hF48OyxKGWNnU2hopfCQR7smjzkAHgdkYQ1N giHvX8oc3tgn5VjXRz7LKskunlTdSnuUTwO2CKaQnbXfU3NGcmF3SjZxL2IP</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>shibboleth.bbaw.de</KeyName>
-        <X509Data>
-          <X509SubjectName>CN=shibboleth.bbaw.de,OU=DWDS,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</X509SubjectName>
           <X509Certificate>MIIKeTCCCWGgAwIBAgIMISbbgCFBTIIBW5GtMA0GCSqGSIb3DQEBCwUAMIGNMQsw CQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVz IERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4t UEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTE5 MDYxNzA5MzE0MloXDTIxMDkxODA5MzE0MlowgZkxCzAJBgNVBAYTAkRFMQ8wDQYD VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjE8MDoGA1UECgwzQmVybGluLUJy YW5kZW5idXJnaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNjaGFmdGVuMQ0wCwYD VQQLDAREV0RTMRswGQYDVQQDDBJzaGliYm9sZXRoLmJiYXcuZGUwggIiMA0GCSqG SIb3DQEBAQUAA4ICDwAwggIKAoICAQCowdi9sgqVGY2oGF8AL3ASt2s1Ynp182JE Qzbl8ZF+PN0nuGhqg1M+cPXpaacWI37uvJsBDWT0+KeLN8uVwyc0byhtrPz3tEZo YzpvDdtAp9SMl+RbaIIt/QDv2iGomnBSQbN4Psm5M1Y4IOiuzD6yQIQwd8m4BblA ne9rqtijy1sKlIL/EzMDa7HiogK5lJstKGrXRVxUTLSQQpNc9QgKVo2b1wiPwv9W AZ/1SMqmF0qZWT4sm2Can3/4D/ImROh33Xs/PYKPVIGaJ7hikx4fzmvR8Zj9Vlwq kL7TrGd2AjFYYCnfhpj+ihjN5msyE1YaCR8sbjs8Zj+ldPwxBfSoWhlE4enU5eU3 NsJMhdP7mmK4zdLPZCDgQDbBHKZ53soDcH7gnwEE0nhc2FHANrtMj58c5sd7mKvi 3A9VPYcrTQhnzJmFsNPFbod5xu8l7a2CrJNCmVPTgw84u525vSNRyrR8Yi0uIrec NqazWyKsgnGkL4SCs22+0iI39ny8+LCgvgpLaeOtWoRpnobdzVDQ668MfyDZ1RML qUfU6hrfM+aihwve4kIs5Qq8h6+WXSTMiVGJYZdUiOmrz7SghN2JHpQiVLy5swUy 77Mt8Whst1P89O0YGoIxlbURp/KUvyBrZkSJAhToifGrKRLk3bnVVtw/wS1q4pd2 zbZxzHml4QIDAQABo4IFyTCCBcUwVwYDVR0gBFAwTjAIBgZngQwBAgIwDQYLKwYB BAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAQBg4rBgEEAYGtIYIsAQEEBDAQBg4r BgEEAYGtIYIsAgEEBDAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFGskFA0Ml8bK66fhLfdm Q/RcLWyQMB8GA1UdIwQYMBaAFGs6mIv58lOJ2uCtsjIeCR/oqjt0MB0GA1UdEQQW MBSCEnNoaWJib2xldGguYmJhdy5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRw Oi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNy bC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2Jh bC1nMi9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYB BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJ BggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFs LWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2Nk cDIucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jYWNlcnQvY2FjZXJ0 LmNydDCCA2EGCisGAQQB1nkCBAIEggNRBIIDTQNLAHcAb1N2rDHwMRnYmQCkURX/ dxUcEdkCwQApBo2yCJo32RMAAAFrZMdLPgAABAMASDBGAiEA9ZkAAqmxQ9UMpjiH w9A2WzYqMxy1wECoixHUXoWGf8ECIQDVmvAuhtDbgQRxs/xn2ZIL20DZ/k2ZdtP5 Qc6bvVzMOAB3AKrnC388uNVmyGwvFpecn0RfaasOtFNVibL3egMBBPPNAAABa2TH S0IAAAQDAEgwRgIhANNyHEfC9/35158UjGDblWX7j9wm4eohUmHvU84IATfvAiEA 7SGLjSl6PYu9f+eTDkhgN6hQIIQIwt1bd9qcouXeXjkAdgBVgdTCFpA2AUrqC5tX PFPwwOQ4eHAlCBcvo6odBxPTDAAAAWtkx0w6AAAEAwBHMEUCIHf62sdog/gCBoxU LgOdH6FQBCowUccUV+FyVrzM9bUXAiEA6346tBoJEpVXaXhsw40s8kGTJ/85GgXS 40rL+vzcpQUAdgDuS723dc5guuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWtk x0udAAAEAwBHMEUCIQDnKZDPKLSHmO+sG9PnhtLl4oKGbthBpxkhMJ5lqDgZ0gIg NeNmwRqX+Myze5Db4WQyXO8eBS7LHCBqqcUyoNfBqWkAdwC72d+8H4pxtZOUI5eq kntHOFeVCqtS6BqQlmQ2jh7RhQAAAWtkx0uYAAAEAwBIMEYCIQC8FYApZWhyJBfy +65Y1aAmaTGFyujZ9IKseIZiJS5iMwIhAOxNwpQzb5TBJgGsbftMaF0/YGICh9TQ PdWMclk5us1WAHYApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFr ZMdLpAAABAMARzBFAiBMs69t8rl7C3JEtVbcztRtBF0xzFVjSZhnOwnMeMpfOAIh AJ9Ho9kbLbgNRz7xmYwYeV2KCFBhfzB2ArqREZUkaGsQAHYARJRlLrDuzq/EQAfY qP4owNrmgr7YyzG1P9MzlrW2gagAAAFrZMdRqgAABAMARzBFAiEAyY6ai1bPftXs bDl189rq+P3XKihwOSrIUGA5OrV3nGYCICkND8cwTmeSw9ut3G73deblNa7aR7Se J+xm0QMwcXlLMA0GCSqGSIb3DQEBCwUAA4IBAQAYYOr5SFi6EarOwm7/9etsKjaT 1wjyx2KFCfgKCvXjN109nz8DsZ4Re0FcVYvn3xTU4EDs0MjQoF4Uk15OdjNHI+5M FQfFr+W9RO8XZ+AuLa2VOeWumlSbE8AVWScbdpTLxz6i4PeutAuc+BaOpk/kPmBw 2/QG8Cr2ChUV+OGecIS+vQa1whXWB5yscwPQQZU7USsqALWVpNTEuBzuslLXuAc5 UX56/CtmVcU0zRTZP4nvW/ddZOB+hF48OyxKGWNnU2hopfCQR7smjzkAHgdkYQ1N giHvX8oc3tgn5VjXRz7LKskunlTdSnuUTwO2CKaQnbXfU3NGcmF3SjZxL2IP</X509Certificate>
         </X509Data>
       </KeyInfo>
@@ -64,20 +53,12 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">BBAW - CLARIN-Dienste</ServiceName>
-      <ServiceName xml:lang="en">BBAW - CLARIN services</ServiceName>
-      <ServiceDescription xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</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="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="true"/>
-    </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e209</OrganizationName>
-    <OrganizationName xml:lang="en">e209</OrganizationName>
+    <OrganizationName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</OrganizationName>
+    <OrganizationName xml:lang="en">Berlin-Brandenburg Academy of Sciences and Humanities</OrganizationName>
     <OrganizationDisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Berlin-Brandenburgische Akademie der Wissenschaften</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Berlin-Brandenburg Academy of Sciences and Humanities</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.bbaw.de</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.bbaw.de</OrganizationURL>
   </Organization>
@@ -96,9 +77,4 @@
     <SurName>Zimmer</SurName>
     <EmailAddress>mailto:zimmer@bbaw.de</EmailAddress>
   </ContactPerson>
-  <ContactPerson xmlns:refeds="http://refeds.org/metadata" contactType="other" refeds:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Kai</GivenName>
-    <SurName>Zimmer</SurName>
-    <EmailAddress>mailto:security@bbaw.de</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>