Normalize use of namespace prefix and remove comments

author: Johan Wassberg <jocar@sunet.se> 2022-08-25 15:10:24 +0200
committer: Johan Wassberg <jocar@sunet.se> 2022-08-25 15:10:24 +0200
commit: bfe5b9dc87edd86e468c6f958298f5b30af5b957 (patch)
tree: febe3c08e7a807fcc20c4191112e6e88a96ee11b /swamid-2.0
parent: 83234c31e09a9b3a54e071796e014e86d109871a (diff)
259 files changed, 3732 insertions, 4224 deletions
diff --git a/swamid-2.0/acc.nais.uhr.se-shibboleth.xml b/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
index 0443bc4b..827ced8a 100644
--- a/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
@@ -98,7 +98,6 @@ hqj4vsnmj5P2D3MHXocrWkPzxg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <!-- Required för personnummer -->
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">NaisAcc</md:ServiceName>
       <md:ServiceName xml:lang="sv">NaisAcc</md:ServiceName>
diff --git a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml b/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
index 8df0f7be..49ec51c7 100644
--- a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
@@ -97,7 +97,6 @@ rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <!-- Required för personnummer -->
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Valda</md:ServiceName>
       <md:ServiceName xml:lang="sv">Valda</md:ServiceName>
diff --git a/swamid-2.0/account.lnu.se-saml2.xml b/swamid-2.0/account.lnu.se-saml2.xml
index b6bf35bb..5fc5fe20 100644
--- a/swamid-2.0/account.lnu.se-saml2.xml
+++ b/swamid-2.0/account.lnu.se-saml2.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Linnéuniversitetets kontoportal</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Linnaeus University account portal</mdui:DisplayName>
@@ -22,60 +22,60 @@
         <mdui:InformationURL xml:lang="sv">https://account.lnu.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://account.lnu.se/</mdui:InformationURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDEzCCAfugAwIBAgIUeYY2yXtuU7wecSXB/RXl2VVpAtowDQYJKoZIhvcNAQELBQAwGTEXMBUGA1UEAwwOYWNjb3VudC5sbnUuc2UwHhcNMjAwNjI1MTAwMDUxWhcNMzAwNjI1MTAwMDUxWjAZMRcwFQYDVQQDDA5hY2NvdW50LmxudS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkB5uZNpETgCcj1Pa9ocDzJJXvgw9b3uu6OZJUwLOZ78P0FfTyZOgU1P5PVXpk6Beh2BLmQ8RrghJvfnPHKGXzgY3NeR5loxE534y/HscxvAsu29aCI05eCQqQb2Ob91hCx5wAuyNi4pBDUBVfVu4rKhOTh7JJ6+kl3KwK877yc9UC1QBqKfqjVdcHu1AmuJCw5vKpoxHF4Fs+uTp+Jiz79Wt99g6cPCfNzeuvuKSD4wvVi9jJ1vIVzV2ynFJWf2g872NcH9blCJ0uBQjOkoU+ddMC+hbkysKNtKcXWQ7yOUVG2/Uoo/yzTgpFgJ6r37CEQxLJSHkCGnFJoADiN6dsCAwEAAaNTMFEwHQYDVR0OBBYEFAgW7jGX8iULHCxoBcjQcBpXSESAMB8GA1UdIwQYMBaAFAgW7jGX8iULHCxoBcjQcBpXSESAMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGi8brijWyDk/ZnBue84vJq3ZYIS+shulKnlWw9MQty+nJYio4BP6jCe6Ot/Ks3uhUmvWcwns0hR2+wGgFQNCdJcwK2fv3c7AeWKC11tkoIjhoSTCpkZ+0g8Kure8bB6vbFgF4eYmQitPweNMBgVVbSQWYBzegyrawhh+nZMgiCEbA0LF46iVudivOPOMKe+RCLbAAq6y6jY2tBtELvxKJWN8Up6ZOIusAFAZDoDqhutUCXRgW5ccZWRdEsqOk/oycU0woMfuAO/hj9fgdLJhQNze2Jz6mZNWD6TFSH1O0OPOZ0TjG2rj2F8J7W1FqJPg7E4/D+0rsqhiJnG8+SbXio=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.lnu.se/Saml2/Logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.lnu.se/Saml2/Acs" isDefault="true" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.lnu.se/Saml2/Acs" isDefault="false" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.qa.lnu.se/Saml2/Acs" isDefault="false" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.qa.lnu.se/Saml2/Acs" isDefault="false" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.dev.lnu.se/Saml2/Acs" isDefault="false" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.dev.lnu.se/Saml2/Acs" isDefault="false" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:44348/Saml2/Acs" isDefault="false" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost:44348/Saml2/Acs" isDefault="false" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:5001/Saml2/Acs" isDefault="false" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost:5001/Saml2/Acs" isDefault="false" index="9"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Linnaeus University account portal</ServiceName>
-      <ServiceName xml:lang="sv">Linnéuniversitetets kontoportal</ServiceName>
-      <RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">LNU</OrganizationName>
-    <OrganizationName xml:lang="en">LNU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linnaeus University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://lnu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://lnu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Linnaeus University</Company>
-    <GivenName>IT Servicedesk</GivenName>
-    <EmailAddress>mailto:it-support@lnu.se</EmailAddress>
-    <TelephoneNumber>+46 480 44 67 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Linnaeus University</Company>
-    <GivenName>IT Servicedesk</GivenName>
-    <EmailAddress>mailto:it-support@lnu.se</EmailAddress>
-    <TelephoneNumber>+46 480 44 67 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Linnaeus University</Company>
-    <GivenName>IT Servicedesk</GivenName>
-    <EmailAddress>mailto:it-support@lnu.se</EmailAddress>
-    <TelephoneNumber>+46 480 44 67 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Linnaeus University Incident Response Team</GivenName>
-    <EmailAddress>mailto:irt@lnu.se</EmailAddress>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUeYY2yXtuU7wecSXB/RXl2VVpAtowDQYJKoZIhvcNAQELBQAwGTEXMBUGA1UEAwwOYWNjb3VudC5sbnUuc2UwHhcNMjAwNjI1MTAwMDUxWhcNMzAwNjI1MTAwMDUxWjAZMRcwFQYDVQQDDA5hY2NvdW50LmxudS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkB5uZNpETgCcj1Pa9ocDzJJXvgw9b3uu6OZJUwLOZ78P0FfTyZOgU1P5PVXpk6Beh2BLmQ8RrghJvfnPHKGXzgY3NeR5loxE534y/HscxvAsu29aCI05eCQqQb2Ob91hCx5wAuyNi4pBDUBVfVu4rKhOTh7JJ6+kl3KwK877yc9UC1QBqKfqjVdcHu1AmuJCw5vKpoxHF4Fs+uTp+Jiz79Wt99g6cPCfNzeuvuKSD4wvVi9jJ1vIVzV2ynFJWf2g872NcH9blCJ0uBQjOkoU+ddMC+hbkysKNtKcXWQ7yOUVG2/Uoo/yzTgpFgJ6r37CEQxLJSHkCGnFJoADiN6dsCAwEAAaNTMFEwHQYDVR0OBBYEFAgW7jGX8iULHCxoBcjQcBpXSESAMB8GA1UdIwQYMBaAFAgW7jGX8iULHCxoBcjQcBpXSESAMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGi8brijWyDk/ZnBue84vJq3ZYIS+shulKnlWw9MQty+nJYio4BP6jCe6Ot/Ks3uhUmvWcwns0hR2+wGgFQNCdJcwK2fv3c7AeWKC11tkoIjhoSTCpkZ+0g8Kure8bB6vbFgF4eYmQitPweNMBgVVbSQWYBzegyrawhh+nZMgiCEbA0LF46iVudivOPOMKe+RCLbAAq6y6jY2tBtELvxKJWN8Up6ZOIusAFAZDoDqhutUCXRgW5ccZWRdEsqOk/oycU0woMfuAO/hj9fgdLJhQNze2Jz6mZNWD6TFSH1O0OPOZ0TjG2rj2F8J7W1FqJPg7E4/D+0rsqhiJnG8+SbXio=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.lnu.se/Saml2/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.lnu.se/Saml2/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.lnu.se/Saml2/Acs" isDefault="false" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.qa.lnu.se/Saml2/Acs" isDefault="false" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.qa.lnu.se/Saml2/Acs" isDefault="false" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.dev.lnu.se/Saml2/Acs" isDefault="false" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.dev.lnu.se/Saml2/Acs" isDefault="false" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:44348/Saml2/Acs" isDefault="false" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost:44348/Saml2/Acs" isDefault="false" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:5001/Saml2/Acs" isDefault="false" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost:5001/Saml2/Acs" isDefault="false" index="9"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Linnaeus University account portal</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Linnéuniversitetets kontoportal</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">LNU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Linnaeus University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://lnu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://lnu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Linnaeus University</md:Company>
+    <md:GivenName>IT Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:it-support@lnu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 480 44 67 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Linnaeus University</md:Company>
+    <md:GivenName>IT Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:it-support@lnu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 480 44 67 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Linnaeus University</md:Company>
+    <md:GivenName>IT Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:it-support@lnu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 480 44 67 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Linnaeus University Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:irt@lnu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/account.mdh.se-shibboleth.xml b/swamid-2.0/account.mdh.se-shibboleth.xml
index d9bf97c5..f0c06e94 100644
--- a/swamid-2.0/account.mdh.se-shibboleth.xml
+++ b/swamid-2.0/account.mdh.se-shibboleth.xml
@@ -51,16 +51,6 @@ Ty6ceQwd7bOvvrpf5YqChJKmoxF3bTiK
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!--
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.mdh.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.mdh.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.mdh.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.mdh.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.mdh.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.mdh.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.mdh.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.mdh.se/Shibboleth.sso/NIM/Artifact"/>
-    -->
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.mdh.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account.mdh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.mdh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
diff --git a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml b/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
index 6e612575..87141a0d 100644
--- a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
@@ -5,16 +5,16 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.sp.se/adfs/services/trust">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.sp.se/adfs/services/trust">
     <md:Extensions>
       <shibmd:Scope regexp="false">ri.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -33,38 +33,38 @@
         <mdui:DomainHint>ri.se</mdui:DomainHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC1jCCAb6gAwIBAgIQQgPVzpJVa6NDIUYTr9T06DANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLnNwLnNlMB4XDTE5MDYyNDA2NDk0MVoXDTI0MDYyMjA2NDk0MVowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPkxkGBEpvrPc+V/HKaOg8lb4QtFqIMW2bjvp2YrbOiaEYgwsnJNm6d7JKsGO+AfEomf7GhE+pKTqPvrmVzL+Qq9X2Cqj6pHILgEy+NDHeq9F9RRqp+YIgG4sHjbrBoi2zg2XRdLBbgvVd47OHYCflsAo2pP7VrLY8nvhsEikLcK+Xs8TW/Owf2i9JzNBuEHQbPlPtyFHZ+DVXLFuLRop1E1J/bnUgSlxtU1XDjKUHnIqy9xvzIMCQEtmT+DHZYy24aGiRclQeSxS5tgje8/gmbnb21xu/rZ0i6Nho9nmIHFK+fJ0tikdNPfrVBaTUpyV6ITFSmA+SpeerVlFYzhEBkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAy8FjBavJDPsDpza6C8/6PI1M+DSvLA23j3Ix/V5heO/jwYRjTrDZcymWQ5GhQIdz7pa1mliDX0ZFbHPiDCMuMf6R7oZY4oRPTeMMixD9wX1OULGHtOCjBnJkh8ezbvefa0qSqH7cNnlgNbhpF4Jr7tMBXWV63QLGqswstt04RMywzp1lR3QNHZn6oqzRArmGOLaz5RpNq1/WkI7kVukcAjJ9KnHkvDPrbl/Bbqz6q4LhRG4BFXfFqTeP8TaqeNiBkKo0x5qtnaCwQOnH3NauBZTwfY/dtXJNGLnS0Y3VcUmkUorPaRRzmhG1YfL9JVQh0Fx7IxntT2DPjG4Z0v6phQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0DCCAbigAwIBAgIQIIjCY0H4B4lOIMMuEej49jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLnNwLnNlMB4XDTE4MTAwMTEwNTIwOVoXDTIzMDkzMDEwNTIwOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAgtBgigsDWI39n+hab5cb2l5+DPnchuCi6JiFauM4OPDYEWTK2a1M1DHELS5DsHPyRxZizVp5oRoJYUEwVefmN7Rd8uaFa7Ygu6yRjTtLCdOHjAka8u4J+iqcRwPP6P6UYL/9neV7jacZ4ar4XpXVspZylxVhwMAdwM2vRhAXrNuwj1m7m1pzWtDscxiEimvS8H97XQcv2XCPeW35x1yQODl4WhfX60lWv0j2W3CIE+bpZZV7DnZoOeIaPmakypW1OD78nLXAT6JL+PHR342mHFZ8M9/H+9pd15yILXiJDFoAezNRvSZjFJfsUNpnFSy+cVROMZ1rsgubTvljvrbkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQo++ox3eMut0uzZ6HGp2h5ey2Qhq6JzdG8fBhf4bcKS55NsdlrKvBz73DY7evuuh/4ouZQtazOG+3O8rOrfxol3vhGu8eRx3vxNfETHTNr0bBEFClmZqDMxhr987BJoSmhTOKEuWtsqH0qBZSzpzYkqngACL9DUwSLTPODQgVZKu7b8tqXWxhNb89hk5B1nsm+YuHoRiMNRKV8bW5BVAKySurnhZRfOs8+Xhaj1OGvjItUxcjB1pVJHuLas80YjIGpFd0osAcxkAUhJW8dUnRnFsSg0xg0WmJjtGeiSUSCqYdxWnxXeiqymiMjDok8jRu/AA4XUERkJpY9V/LUXkQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.sp.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">RISE Research Institutes of Sweden</OrganizationName>
-    <OrganizationName xml:lang="en">RISE Research Institutes of Sweden</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">RISE Research Institutes of Sweden</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">RISE Research Institutes of Sweden</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.ri.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.ri.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <EmailAddress>mailto:support.it@ri.se</EmailAddress>
-  </ContactPerson>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQQgPVzpJVa6NDIUYTr9T06DANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLnNwLnNlMB4XDTE5MDYyNDA2NDk0MVoXDTI0MDYyMjA2NDk0MVowJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPkxkGBEpvrPc+V/HKaOg8lb4QtFqIMW2bjvp2YrbOiaEYgwsnJNm6d7JKsGO+AfEomf7GhE+pKTqPvrmVzL+Qq9X2Cqj6pHILgEy+NDHeq9F9RRqp+YIgG4sHjbrBoi2zg2XRdLBbgvVd47OHYCflsAo2pP7VrLY8nvhsEikLcK+Xs8TW/Owf2i9JzNBuEHQbPlPtyFHZ+DVXLFuLRop1E1J/bnUgSlxtU1XDjKUHnIqy9xvzIMCQEtmT+DHZYy24aGiRclQeSxS5tgje8/gmbnb21xu/rZ0i6Nho9nmIHFK+fJ0tikdNPfrVBaTUpyV6ITFSmA+SpeerVlFYzhEBkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAy8FjBavJDPsDpza6C8/6PI1M+DSvLA23j3Ix/V5heO/jwYRjTrDZcymWQ5GhQIdz7pa1mliDX0ZFbHPiDCMuMf6R7oZY4oRPTeMMixD9wX1OULGHtOCjBnJkh8ezbvefa0qSqH7cNnlgNbhpF4Jr7tMBXWV63QLGqswstt04RMywzp1lR3QNHZn6oqzRArmGOLaz5RpNq1/WkI7kVukcAjJ9KnHkvDPrbl/Bbqz6q4LhRG4BFXfFqTeP8TaqeNiBkKo0x5qtnaCwQOnH3NauBZTwfY/dtXJNGLnS0Y3VcUmkUorPaRRzmhG1YfL9JVQh0Fx7IxntT2DPjG4Z0v6phQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQIIjCY0H4B4lOIMMuEej49jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLnNwLnNlMB4XDTE4MTAwMTEwNTIwOVoXDTIzMDkzMDEwNTIwOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5zcC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAgtBgigsDWI39n+hab5cb2l5+DPnchuCi6JiFauM4OPDYEWTK2a1M1DHELS5DsHPyRxZizVp5oRoJYUEwVefmN7Rd8uaFa7Ygu6yRjTtLCdOHjAka8u4J+iqcRwPP6P6UYL/9neV7jacZ4ar4XpXVspZylxVhwMAdwM2vRhAXrNuwj1m7m1pzWtDscxiEimvS8H97XQcv2XCPeW35x1yQODl4WhfX60lWv0j2W3CIE+bpZZV7DnZoOeIaPmakypW1OD78nLXAT6JL+PHR342mHFZ8M9/H+9pd15yILXiJDFoAezNRvSZjFJfsUNpnFSy+cVROMZ1rsgubTvljvrbkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAQo++ox3eMut0uzZ6HGp2h5ey2Qhq6JzdG8fBhf4bcKS55NsdlrKvBz73DY7evuuh/4ouZQtazOG+3O8rOrfxol3vhGu8eRx3vxNfETHTNr0bBEFClmZqDMxhr987BJoSmhTOKEuWtsqH0qBZSzpzYkqngACL9DUwSLTPODQgVZKu7b8tqXWxhNb89hk5B1nsm+YuHoRiMNRKV8bW5BVAKySurnhZRfOs8+Xhaj1OGvjItUxcjB1pVJHuLas80YjIGpFd0osAcxkAUhJW8dUnRnFsSg0xg0WmJjtGeiSUSCqYdxWnxXeiqymiMjDok8jRu/AA4XUERkJpY9V/LUXkQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.sp.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">RISE Research Institutes of Sweden</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">RISE Research Institutes of Sweden</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">RISE Research Institutes of Sweden</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">RISE Research Institutes of Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.ri.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.ri.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:support.it@ri.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
index 46fc53f0..96a0c2a2 100644
--- a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
@@ -5,14 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
@@ -23,33 +23,33 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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://adfs.test.umu.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.umu.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.test.umu.se/adfs/services/trust">
-    <Extensions>
-      <shibmd:Scope xmlns="" regexp="false">umu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.umu.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.test.umu.se/adfs/services/trust">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Umeå universitet (TEST)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Umeå University (TEST)</mdui:DisplayName>
@@ -67,34 +67,34 @@
         <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
         <mdui:GeolocationHint>geo:63.820554,20.305799</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.test.umu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Umeå University</Company>
-    <SurName>ITS datordrift</SurName>
-    <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
-    <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.test.umu.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ams.ki.se-shibboleth.xml b/swamid-2.0/ams.ki.se-shibboleth.xml
index f7c82df3..52d7af8e 100644
--- a/swamid-2.0/ams.ki.se-shibboleth.xml
+++ b/swamid-2.0/ams.ki.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-2019-12-02
-Added on request from Uwe Bertram" <ubertram@a-tune.com> for access to login.ki.se
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ams.ki.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-12-02T10:49:25Z">
diff --git a/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml b/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
index 672a8409..7c23eb44 100644
--- a/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://anonymous.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = https://refeds.org/category/anonymous-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/app.sh.se.xml b/swamid-2.0/app.sh.se.xml
index cd270131..bfb8a502 100644
--- a/swamid-2.0/app.sh.se.xml
+++ b/swamid-2.0/app.sh.se.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Sodertorn University AL2 authentication service</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Södertörns Högskolas AL2 autentiseringsservice</mdui:DisplayName>
@@ -22,8 +22,8 @@
         <mdui:InformationURL xml:lang="en">https://app.sh.se/spinfo/index_en.html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://app.sh.se/spinfo/index_sv.html</mdui:InformationURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDajCCAlICCQDAdpOPJpYObTANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
@@ -48,11 +48,11 @@ c+39hicQnAwDP2Umuz1Nkl/puI8iX1Nba5Aw9Ku/n7ax2bx7j8YWU5TOLNMwL6Oo
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.sh.se/auth/callback"/>
-  </SPSSODescriptor>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.sh.se/auth/callback"/>
+  </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index aeb00c10..098541f7 100644
--- a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -14,7 +14,7 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <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://artisan-idp.sunet.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://artisan-idp.sunet.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
index ee1f357d..c8453632 100644
--- a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
@@ -14,12 +14,12 @@
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFBTCCAu2gAwIBAgIJAOCYaM8sK77iMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIJAOCYaM8sK77iMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
 BAMMDnNhdG9zYV9iYWNrZW5kMB4XDTE3MDYxNTA4MDYzOFoXDTI3MDYxMzA4MDYz
 OFowGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwggIiMA0GCSqGSIb3DQEBAQUA
 A4ICDwAwggIKAoICAQDG8OTDAYcGS6fedeBj1U0YpmQk5yCbzsMaZ4Z5ECtih/oG
@@ -46,14 +46,14 @@ KCx6DuzaVk24KMt83ElEBO/eIfawg7FDU7oq/J+e9vVVuDew1IKE4vDWMwMQE5mJ
 rUzv15hHfUzy/fm3oPPvuHd8EPusszrOOcYTpZTHcCJl7q59E2j4uMPA6KC51Ht3
 RANbqTAYMo5fApgpxVxf8XBeQtlq3RDlnW75/oGTdymCOyLCorAbV2FumyZbawmI
 HGYrlNKYma5Wmcg0BqTiZPbh4Z8VWJBWGHIGND3F23ElplSxM+j63k4=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFBTCCAu2gAwIBAgIJAOCYaM8sK77iMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIJAOCYaM8sK77iMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
 BAMMDnNhdG9zYV9iYWNrZW5kMB4XDTE3MDYxNTA4MDYzOFoXDTI3MDYxMzA4MDYz
 OFowGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwggIiMA0GCSqGSIb3DQEBAQUA
 A4ICDwAwggIKAoICAQDG8OTDAYcGS6fedeBj1U0YpmQk5yCbzsMaZ4Z5ECtih/oG
@@ -80,9 +80,9 @@ KCx6DuzaVk24KMt83ElEBO/eIfawg7FDU7oq/J+e9vVVuDew1IKE4vDWMwMQE5mJ
 rUzv15hHfUzy/fm3oPPvuHd8EPusszrOOcYTpZTHcCJl7q59E2j4uMPA6KC51Ht3
 RANbqTAYMo5fApgpxVxf8XBeQtlq3RDlnW75/oGTdymCOyLCorAbV2FumyZbawmI
 HGYrlNKYma5Wmcg0BqTiZPbh4Z8VWJBWGHIGND3F23ElplSxM+j63k4=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
diff --git a/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml b/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
index 3c746a0e..83da2bd7 100644
--- a/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://assurance.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, RAF tests-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/atlas.slu.se-shibboleth.xml b/swamid-2.0/atlas.slu.se-shibboleth.xml
index 354c9824..91214ca5 100644
--- a/swamid-2.0/atlas.slu.se-shibboleth.xml
+++ b/swamid-2.0/atlas.slu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://atlas.slu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-09-03T11:02:28Z">
diff --git a/swamid-2.0/backweb.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.antagning.se-hubble-sp.xml
index f7f4c48f..bbef27d1 100644
--- a/swamid-2.0/backweb.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.antagning.se-hubble-sp.xml
@@ -91,25 +91,25 @@ nTUEA0OqfI3tFzYigYztt7ALtQHK0XO5K3MdCHus2srw+NKUe6mwy3NcSv2U0SI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  <md:ContactPerson contactType="administrative">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>UHR Systemdrift</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
     <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  <md:ContactPerson contactType="technical">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>Håkan Pettersson</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
     <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  <md:ContactPerson contactType="support">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>UHR Systemdrift</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
diff --git a/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
index 342d8589..07a54e5a 100644
--- a/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
@@ -91,28 +91,28 @@ r4+XgT0UL7OozzUEVXEMuIxRaSwo+CtUnWoZjlVi813gHPGYl2F29OeEkGIYJU+N
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.demo.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.demo.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Swedish Council for Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">www.uhr.se</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">www.uhr.se/en</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>HÃ¥kan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>HÃ¥kan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
index 9e432a4c..6797ed32 100644
--- a/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
@@ -91,25 +91,25 @@ ihDEIZcSIfuOauweBRXYMbkL
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.test.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  <md:ContactPerson contactType="administrative">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>UHR Systemdrift</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
     <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  <md:ContactPerson contactType="technical">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>Håkan Pettersson</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
     <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  <md:ContactPerson contactType="support">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>UHR Systemdrift</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
diff --git a/swamid-2.0/beta.augustus.se.xml b/swamid-2.0/beta.augustus.se.xml
index 90b0a7c6..c9af2794 100644
--- a/swamid-2.0/beta.augustus.se.xml
+++ b/swamid-2.0/beta.augustus.se.xml
@@ -5,25 +5,25 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIB1zCCAUCgAwIBAgIBADANBgkqhkiG9w0BAQUFADAbMRkwFwYDVQQDExBiZXRhLmF1Z3VzdHVzLnNlMB4XDTA3MDMwNjEwMDQxNFoXDTA3MDQwNTEwMDQxNFowGzEZMBcGA1UEAxMQYmV0YS5hdWd1c3R1cy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAspI7ryh7WFO+CWytUzDg4U/WEKsX/ty82lQ31JdBhKkVV66vPRWz81QjzPruL7+dLLDtgcMJNPwNR8BHOHA0R/XlYsePA/GL0iGbwkXRlPs63wELlaj1TiXgtnOBRLrBRHyUIcnrq3c2tVrrUmLp4gifKIHhBgsKwZkDvUN+88UCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQCXjwpqbm73q7ZadtdRLeLCjMspJjHWMGRCJvIb+EqEaO4CFFHFl+XxSUHIkbZk3VUrTZkQ+gQSY649mhsz+TL+saFPRqQQtWIS8okALuVStN0ySkY1NRml8Ou9sq3/CRl77f02Ff5QgemFqQGilmso7XEXhLDL2kOFxKLHBtbQzg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.augustus.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Genuine Text</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Genuine Text</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.genuinetext.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Know Net AB</Company>
-    <GivenName>Ingemar</GivenName>
-    <SurName>Lundström</SurName>
-    <EmailAddress>mailto:ingemar.lundstrom@knownet.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.augustus.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Genuine Text</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Genuine Text</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.genuinetext.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Know Net AB</md:Company>
+    <md:GivenName>Ingemar</md:GivenName>
+    <md:SurName>Lundström</md:SurName>
+    <md:EmailAddress>mailto:ingemar.lundstrom@knownet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/betafoo.nordu.net-shibboleth.xml b/swamid-2.0/betafoo.nordu.net-shibboleth.xml
index 6cf4083a..444dcd0b 100644
--- a/swamid-2.0/betafoo.nordu.net-shibboleth.xml
+++ b/swamid-2.0/betafoo.nordu.net-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://betafoo.nordu.net/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://betafoo.nordu.net/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml b/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
index 51449ef1..f809e77e 100644
--- a/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
+++ b/swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://bibliometri.swepub.kb.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-17T08:57:07Z">
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index ded59224..0d4f6909 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -15,7 +15,7 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <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://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">NORDUnet Box Service Access</mdui:DisplayName>
         <mdui:Description xml:lang="sv">NORDUnet Box Service Access</mdui:Description>
diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 095337f2..d12efcf2 100644
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -14,7 +14,7 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <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://box-idp.sunet.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://box-idp.sunet.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SUNET Box Service Access</mdui:DisplayName>
         <mdui:Description xml:lang="sv">SUNET Box Service Access</mdui:Description>
diff --git a/swamid-2.0/brainstorm.swami.se-shibboleth.xml b/swamid-2.0/brainstorm.swami.se-shibboleth.xml
index dd6614d4..ce62bae0 100644
--- a/swamid-2.0/brainstorm.swami.se-shibboleth.xml
+++ b/swamid-2.0/brainstorm.swami.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://brainstorm.swamid.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://brainstorm.swamid.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/brandkeeper.se-wsfed.xml b/swamid-2.0/brandkeeper.se-wsfed.xml
index ab862e12..c3216056 100644
--- a/swamid-2.0/brandkeeper.se-wsfed.xml
+++ b/swamid-2.0/brandkeeper.se-wsfed.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">BrandKeeper</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">BrandKeeper</mdui:DisplayName>
@@ -23,29 +23,29 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://www.incited.se/InSys/v2/Public/PrivacyStatement</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.incited.se/InSys/v2/Public/PrivacyStatement/Sv</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDETCCAf2gAwIBAgIQeslj7mn+D45JNi5RIK+YaDAJBgUrDgMCHQUAMB4xHDAaBgNVBAMTE0JyYW5kS2VlcGVyIFNQIENlcnQwHhcNMTUwNTA2MTQxMDU3WhcNMzkxMjMxMjM1OTU5WjAeMRwwGgYDVQQDExNCcmFuZEtlZXBlciBTUCBDZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk20h8FkMt5rQ9llrmsSdj4oDSbPEsrqLVBOqE89Rl9qJFAobNGG0WYCwZt2HpSVq+ckO+VVsXcryPiV9nuZ7PnHkBDGifUhSqVZs7+0HQ+ZtrD72qyc/nyoQ9IkjVK8Z72KYh8z9BfrjPWSNcYq2hje1+qfNDivjssWzlQeylowyH82hv9pX7k3UwfnGIXZtHLzNr7RISrhmc9N2lcZFqamAmLRGOnVPh7HdIbXgr9kHgUkMQizfR6tsbLjKRGaAQRSInqtgxVbZmbufg+n8MlVMWoSe4z4u2gVX8hoZf+qcPL7rrXC+iGOcbdZW+bvHJLOCXksN8EUyZ7sZ9BkhXwIDAQABo1MwUTBPBgNVHQEESDBGgBCKwj22127zQUHdOujFenEdoSAwHjEcMBoGA1UEAxMTQnJhbmRLZWVwZXIgU1AgQ2VydIIQeslj7mn+D45JNi5RIK+YaDAJBgUrDgMCHQUAA4IBAQBt6SrU9eeV9yUWH4WfJh5sfRPRwpwyq8+F7KSz0x8XWVNixXvkJ7Vc+6+OSQbKJ2vAZQfsHGaoj7ZsJyw3cMDctwJeeCVxO913RtMfhQZkImJUFCnjx6AamHJBmAaE5hbZp93vKP7cGLlfOeIN0R7XNJ3ZARWcP2yssV1cHW2GgLeHYuG7aFx5gv33omv4leABrPZN7Zl9gzNcAq5PqmbKHv/FQ/+CyqemVwNbvdbDYE3MttofkNdSBvLNmry0fpVDAZJGydJ58w3GaSqTziSZvv56SFDskOZ/Gh3GGIROtezau55+YaPHUarZu91tV6j5VrweRyewzB89OeYVDEvx</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.incited.se/InSys/v2/AuthServices/Acs" index="0" isDefault="true"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">SP</ServiceName>
-      <RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Incited AB</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brandkeeper</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brandkeeper.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <EmailAddress>mailto:support@brandkeeper.se</EmailAddress>
-    <TelephoneNumber>+46 470 771 440</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDETCCAf2gAwIBAgIQeslj7mn+D45JNi5RIK+YaDAJBgUrDgMCHQUAMB4xHDAaBgNVBAMTE0JyYW5kS2VlcGVyIFNQIENlcnQwHhcNMTUwNTA2MTQxMDU3WhcNMzkxMjMxMjM1OTU5WjAeMRwwGgYDVQQDExNCcmFuZEtlZXBlciBTUCBDZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk20h8FkMt5rQ9llrmsSdj4oDSbPEsrqLVBOqE89Rl9qJFAobNGG0WYCwZt2HpSVq+ckO+VVsXcryPiV9nuZ7PnHkBDGifUhSqVZs7+0HQ+ZtrD72qyc/nyoQ9IkjVK8Z72KYh8z9BfrjPWSNcYq2hje1+qfNDivjssWzlQeylowyH82hv9pX7k3UwfnGIXZtHLzNr7RISrhmc9N2lcZFqamAmLRGOnVPh7HdIbXgr9kHgUkMQizfR6tsbLjKRGaAQRSInqtgxVbZmbufg+n8MlVMWoSe4z4u2gVX8hoZf+qcPL7rrXC+iGOcbdZW+bvHJLOCXksN8EUyZ7sZ9BkhXwIDAQABo1MwUTBPBgNVHQEESDBGgBCKwj22127zQUHdOujFenEdoSAwHjEcMBoGA1UEAxMTQnJhbmRLZWVwZXIgU1AgQ2VydIIQeslj7mn+D45JNi5RIK+YaDAJBgUrDgMCHQUAA4IBAQBt6SrU9eeV9yUWH4WfJh5sfRPRwpwyq8+F7KSz0x8XWVNixXvkJ7Vc+6+OSQbKJ2vAZQfsHGaoj7ZsJyw3cMDctwJeeCVxO913RtMfhQZkImJUFCnjx6AamHJBmAaE5hbZp93vKP7cGLlfOeIN0R7XNJ3ZARWcP2yssV1cHW2GgLeHYuG7aFx5gv33omv4leABrPZN7Zl9gzNcAq5PqmbKHv/FQ/+CyqemVwNbvdbDYE3MttofkNdSBvLNmry0fpVDAZJGydJ58w3GaSqTziSZvv56SFDskOZ/Gh3GGIROtezau55+YaPHUarZu91tV6j5VrweRyewzB89OeYVDEvx</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.incited.se/InSys/v2/AuthServices/Acs" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">SP</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Incited AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brandkeeper</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brandkeeper.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@brandkeeper.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 470 771 440</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml
index 682cd0ae..ce173667 100644
--- a/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml
+++ b/swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://cambro-tst1.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cambro-tst1.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml
index 9bfb5216..b1bed22c 100644
--- a/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml
+++ b/swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://cambro-utv1.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cambro-utv1.umdc.umu.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/canvas.education.lu.se-saml2.xml b/swamid-2.0/canvas.education.lu.se-saml2.xml
index c645b446..0c4f0d75 100644
--- a/swamid-2.0/canvas.education.lu.se-saml2.xml
+++ b/swamid-2.0/canvas.education.lu.se-saml2.xml
@@ -22,9 +22,9 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -46,17 +46,17 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -78,14 +78,14 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
 IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
@@ -107,9 +107,9 @@ BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
 XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
 1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
 Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://canvas.education.lu.se/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://canvas.education.lu.se/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
diff --git a/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
index a5f30b17..7edbfe81 100644
--- a/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov1-1.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 1-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
index a49d5996..8c5e5219 100644
--- a/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov1-2.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 2-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
index 17ec160a..6f5515f2 100644
--- a/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov1-3.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from non SWAMID SP-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
index 9f185319..f46b755d 100644
--- a/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov2-1.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 1-->
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-07-04T08:35:32Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
diff --git a/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
index e5c05ead..41066dda 100644
--- a/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov2-2.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 2-->
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-07-04T08:35:32Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
diff --git a/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
index 4cafe656..6053bdf4 100644
--- a/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov2-3.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from non SWAMID SP-->
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/loop" registrationInstant="2022-07-04T08:35:32Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
diff --git a/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml b/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml
index 0541397d..2741f714 100644
--- a/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml
+++ b/swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml
@@ -5,11 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -35,10 +35,10 @@ C2+Rm0cXr6U=
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://coip-test.sunet.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coip-test.sunet.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://coip-test.sunet.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coip-test.sunet.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/coip-test.sunet.se-shibboleth.xml b/swamid-2.0/coip-test.sunet.se-shibboleth.xml
index 097e27ee..06f7bfe2 100644
--- a/swamid-2.0/coip-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/coip-test.sunet.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://coip-test.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://coip-test.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml b/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
index d7f241ee..bd9e4675 100644
--- a/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
+++ b/swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://comanage-test-ds.sunet.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-05T15:04:09Z">
diff --git a/swamid-2.0/comanage.sunet.se-shibboleth.xml b/swamid-2.0/comanage.sunet.se-shibboleth.xml
index 623c832a..acc74a84 100644
--- a/swamid-2.0/comanage.sunet.se-shibboleth.xml
+++ b/swamid-2.0/comanage.sunet.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://comanage.sunet.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-08-10T13:11:20Z">
diff --git a/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml b/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
index c51d8443..4887be3b 100644
--- a/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://confluence-dev.its.umu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-03-23T13:22:58Z">
diff --git a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
index 38cfeb04..5f8fe451 100644
--- a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
@@ -13,8 +13,8 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <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://confluence.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <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://confluence.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence.it.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Confluence at Stockholm University</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Confluence vid Stockholms universitet</mdui:DisplayName>
diff --git a/swamid-2.0/confluence.its.umu.se-shibboleth.xml b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
index dd55fe44..88a60da1 100644
--- a/swamid-2.0/confluence.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://confluence.its.umu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-26T14:42:27Z">
diff --git a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index 3ab743bf..127155a8 100644
--- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -14,10 +14,10 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://connect-beta.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://connect-beta.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <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://connect-beta.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
-      <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://connect-beta.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">SUNET E-Meeting Service (beta)</mdui:DisplayName>
         <mdui:Description xml:lang="en">SUNET Connect makes it easy and simple to organize meetings, seminars and seminars that everyone can attend - no matter where they are.</mdui:Description>
diff --git a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
index 1a3f647b..f63782ed 100644
--- a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
@@ -14,10 +14,10 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://connect-stable.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://connect-stable.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <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://connect-stable.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
-      <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://connect-stable.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-stable.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-stable.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-stable.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-stable.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/connect-test.sunet.se-shibboleth.xml b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
index 61931560..57cfa807 100644
--- a/swamid-2.0/connect-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
@@ -14,7 +14,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://connect-test.sunet.se/Shibboleth.sso/DS/nordu.net" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-test.sunet.se/Shibboleth.sso/DS/nordu.net" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/connect.funet.fi-shibboleth.xml b/swamid-2.0/connect.funet.fi-shibboleth.xml
index a61d31ed..b87d2569 100644
--- a/swamid-2.0/connect.funet.fi-shibboleth.xml
+++ b/swamid-2.0/connect.funet.fi-shibboleth.xml
@@ -13,8 +13,8 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://connect.funet.fi/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://connect.funet.fi/Shibboleth.sso/DS/haka.funet.fi" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/haka.funet.fi" index="2"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml
index ec8cf1c7..173a552f 100644
--- a/swamid-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect.sunet.se-shibboleth.xml
@@ -14,10 +14,10 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://connect.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://connect.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <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://connect.sunet.se/Shibboleth.sso/DS/nordu.net" index="3"/>
-      <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://connect.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/nordu.net" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">SUNET E-Meeting Service</mdui:DisplayName>
         <mdui:Description xml:lang="en">SUNET Connect makes it easy and simple to organize meetings, seminars and seminars that everyone can attend - no matter where they are.</mdui:Description>
diff --git a/swamid-2.0/connect.uninett.no-shibboleth.xml b/swamid-2.0/connect.uninett.no-shibboleth.xml
index 539017ca..7c97be65 100644
--- a/swamid-2.0/connect.uninett.no-shibboleth.xml
+++ b/swamid-2.0/connect.uninett.no-shibboleth.xml
@@ -13,9 +13,9 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://connect.uninett.no/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://connect.uninett.no/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <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://connect.uninett.no/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/kalmar2" index="3"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/crowd-test.sunet.se-shibboleth.xml b/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
index 561d4c21..e156453f 100644
--- a/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://crowd-test.sunet.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-02-21T15:05:12Z">
diff --git a/swamid-2.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml
index 55d0d5e7..5a2d2e73 100644
--- a/swamid-2.0/crowd.nordu.net-shibboleth.xml
+++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml
@@ -13,9 +13,9 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://crowd.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://crowd.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
-      <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://crowd.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">NORDUnet Tools</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">NORDUnet Tools</mdui:DisplayName>
diff --git a/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml b/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
index c6c2a4f6..ea3010a6 100644
--- a/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
+++ b/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Common web services at UB</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Gemensamma webbtjänster vid UB</mdui:DisplayName>
@@ -20,8 +20,8 @@
         <mdui:InformationURL xml:lang="en">https://wiki.ub.uu.se/x/_hfXAQ</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://wiki.ub.uu.se/x/_hfXAQ</mdui:InformationURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -50,24 +50,24 @@ KKh9ztE=
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.ub.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.ub.uu.se/Shibboleth.sso/SLO/POST"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.ub.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.ub.uu.se/Shibboleth.sso/SAML2/ECP" index="2"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Uppsala University Library</OrganizationName>
-    <OrganizationName xml:lang="sv">Uppsala universitetsbibliotek</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University Library</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://ub.uu.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://ub.uu.se/?languageId=1</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala University Library</Company>
-    <GivenName>Rasmus</GivenName>
-    <SurName>Skagersten</SurName>
-    <EmailAddress>mailto:helpdesk@ub.uu.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.ub.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.ub.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.ub.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.ub.uu.se/Shibboleth.sso/SAML2/ECP" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala University Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University Library</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://ub.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://ub.uu.se/?languageId=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala University Library</md:Company>
+    <md:GivenName>Rasmus</md:GivenName>
+    <md:SurName>Skagersten</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/crowdtest.nordu.net-shibboleth.xml b/swamid-2.0/crowdtest.nordu.net-shibboleth.xml
index aa7388b0..4fc3c7d7 100644
--- a/swamid-2.0/crowdtest.nordu.net-shibboleth.xml
+++ b/swamid-2.0/crowdtest.nordu.net-shibboleth.xml
@@ -7,9 +7,9 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://crowdtest.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://crowdtest.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
-      <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://crowdtest.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowdtest.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowdtest.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowdtest.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml b/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
index 408f6a20..a370b248 100644
--- a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
+++ b/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://daisy2.dsv.su.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-09-09T13:23:44Z">
diff --git a/swamid-2.0/data.kb.se-shibboleth.xml b/swamid-2.0/data.kb.se-shibboleth.xml
index d5d4ce99..d5217da5 100644
--- a/swamid-2.0/data.kb.se-shibboleth.xml
+++ b/swamid-2.0/data.kb.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://data.kb.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-10-15T12:43:05Z">
diff --git a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
index d27dd3a3..974036ea 100644
--- a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
+++ b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDqTCCAxKgAwIBAgIQR6zE+Dd0h7n/xp/glALOXTANBgkqhkiG9w0BAQUFADCB
@@ -31,18 +31,18 @@ inwJzduHXWa66JEY8lPf9ir7WKOZ6BcDMfhsYDVRoBoFlStIgXbweoaA/pJbadXH
 qlG83cbyWydqYCCYruAVslAykrwfBXAXdCs4YBs=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dedserv79.levonline.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Emanuel</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emanuel AB</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.emanuel.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Emanuel AB</Company>
-    <GivenName>Fredrik</GivenName>
-    <SurName>Näslund</SurName>
-    <EmailAddress>mailto:fredrik.naslund@emanuel.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dedserv79.levonline.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Emanuel</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emanuel AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emanuel.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Emanuel AB</md:Company>
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Näslund</md:SurName>
+    <md:EmailAddress>mailto:fredrik.naslund@emanuel.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/demo.antagning.se-aws-sp-en.xml b/swamid-2.0/demo.antagning.se-aws-sp-en.xml
index c853fe8f..dffaacdf 100644
--- a/swamid-2.0/demo.antagning.se-aws-sp-en.xml
+++ b/swamid-2.0/demo.antagning.se-aws-sp-en.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo.antagning.se/aws-sp-en">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-11-03T16:34:16Z">
diff --git a/swamid-2.0/demo.antagning.se-aws-sp.xml b/swamid-2.0/demo.antagning.se-aws-sp.xml
index 1e74bd79..053857a7 100644
--- a/swamid-2.0/demo.antagning.se-aws-sp.xml
+++ b/swamid-2.0/demo.antagning.se-aws-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo.antagning.se/aws-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-11-03T16:34:16Z">
diff --git a/swamid-2.0/demo.antagning.se-ecs-sp.xml b/swamid-2.0/demo.antagning.se-ecs-sp.xml
index 9a537bbf..0f5bdd62 100644
--- a/swamid-2.0/demo.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/demo.antagning.se-ecs-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo.antagning.se/ecs-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-11-03T16:34:16Z">
diff --git a/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
index 37754cce..ef65b1d8 100644
--- a/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
+++ b/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
@@ -117,25 +117,25 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/ECP" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Universitets- och hogskoleradet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Jimmy</GivenName>
-    <SurName>Jakobsson</SurName>
-    <EmailAddress>mailto:jimmy.jakobsson@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Jimmy</GivenName>
-    <SurName>Jakobsson</SurName>
-    <EmailAddress>mailto:jimmy.jakobsson@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jimmy</GivenName>
-    <SurName>Jakobsson</SurName>
-    <EmailAddress>mailto:jimmy.jakobsson@umu.se</EmailAddress>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitets- och hogskoleradet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml b/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
index f21a05bb..0ac858e7 100644
--- a/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
+++ b/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
@@ -117,25 +117,25 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.nyaanvandarstod.uhr.se/Shibboleth.sso/SAML2/ECP" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.nyaanvandarstod.uhr.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Universitets- och hogskoleradet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Jimmy</GivenName>
-    <SurName>Jakobsson</SurName>
-    <EmailAddress>mailto:jimmy.jakobsson@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Jimmy</GivenName>
-    <SurName>Jakobsson</SurName>
-    <EmailAddress>mailto:jimmy.jakobsson@umu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jimmy</GivenName>
-    <SurName>Jakobsson</SurName>
-    <EmailAddress>mailto:jimmy.jakobsson@umu.se</EmailAddress>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitets- och hogskoleradet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jimmy</md:GivenName>
+    <md:SurName>Jakobsson</md:SurName>
+    <md:EmailAddress>mailto:jimmy.jakobsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml b/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
index fe1d0efd..6a5bd8d6 100644
--- a/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
@@ -20,10 +20,10 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/dev.cloudmore.com-shibboleth.xml b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
index 0ef22152..5f73158c 100644
--- a/swamid-2.0/dev.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
@@ -20,10 +20,10 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
index 5d087040..3b06ebd7 100644
--- a/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="dev.lararlyftet-validering.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-01-08T07:35:07Z">
diff --git a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml b/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
index bcb52219..7762566f 100644
--- a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://dev.nais.uhr.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-04-29T09:28:49Z">
diff --git a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index 53fae9e6..37aaaf1d 100644
--- a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml b/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
index c6ae17bb..373e086d 100644
--- a/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
+++ b/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://dnt.crc.med.lu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-10-09T14:36:00Z">
diff --git a/swamid-2.0/edumeet.sunet.se.xml b/swamid-2.0/edumeet.sunet.se.xml
index 44934380..161e11f0 100644
--- a/swamid-2.0/edumeet.sunet.se.xml
+++ b/swamid-2.0/edumeet.sunet.se.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">eduMeet SUNET</mdui:DisplayName>
@@ -19,7 +19,7 @@
         <mdui:Description xml:lang="en">Meeting-service hosted by SUNET</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <KeyDescriptor use="signing">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFvzCCA6egAwIBAgIUQ6gHi3OPHNTUdwQRFcYYv9RsNsMwDQYJKoZIhvcNAQEL
@@ -56,8 +56,8 @@ MrmdU0WSNs48VSgVFTvZu3+4NTyiN52vEjh0jnhWeYN+h3c=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFvzCCA6egAwIBAgIUQ6gHi3OPHNTUdwQRFcYYv9RsNsMwDQYJKoZIhvcNAQEL
@@ -94,13 +94,13 @@ MrmdU0WSNs48VSgVFTvZu3+4NTyiN52vEjh0jnhWeYN+h3c=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edumeet.sunet.se/auth/callback"/>
-  </SPSSODescriptor>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edumeet.sunet.se/auth/callback"/>
+  </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
diff --git a/swamid-2.0/edusign-test.lu.se-shibboleth.xml b/swamid-2.0/edusign-test.lu.se-shibboleth.xml
index 5592ed3b..7bb2d6f7 100644
--- a/swamid-2.0/edusign-test.lu.se-shibboleth.xml
+++ b/swamid-2.0/edusign-test.lu.se-shibboleth.xml
@@ -119,25 +119,25 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edusign-test.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edusign-test.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Lund University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.lu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Kåre Hviid</GivenName>
-    <EmailAddress>mailto:kare.hviid@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Eskil Swahn</GivenName>
-    <EmailAddress>mailto:eskil.swahn@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Servicedesk</GivenName>
-    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>IRT Lund University</GivenName>
-    <EmailAddress>mailto:abuse@lu.se</EmailAddress>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kåre Hviid</md:GivenName>
+    <md:EmailAddress>mailto:kare.hviid@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eskil Swahn</md:GivenName>
+    <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>IRT Lund University</md:GivenName>
+    <md:EmailAddress>mailto:abuse@lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/edusign.lu.se-shibboleth.xml b/swamid-2.0/edusign.lu.se-shibboleth.xml
index 00c9e0dd..e0cc612b 100644
--- a/swamid-2.0/edusign.lu.se-shibboleth.xml
+++ b/swamid-2.0/edusign.lu.se-shibboleth.xml
@@ -119,25 +119,25 @@ T+MOe7cGCihHiyOmPA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edusign.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edusign.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Lund University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.lu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Kåre Hviid</GivenName>
-    <EmailAddress>mailto:kare.hviid@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Eskil Swahn</GivenName>
-    <EmailAddress>mailto:eskil.swahn@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Servicedesk</GivenName>
-    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>IRT Lund University</GivenName>
-    <EmailAddress>mailto:abuse@lu.se</EmailAddress>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kåre Hviid</md:GivenName>
+    <md:EmailAddress>mailto:kare.hviid@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eskil Swahn</md:GivenName>
+    <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>IRT Lund University</md:GivenName>
+    <md:EmailAddress>mailto:abuse@lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/eduvpn.sunet.se-shibboleth.xml b/swamid-2.0/eduvpn.sunet.se-shibboleth.xml
index 1e4216fd..e28c4cfe 100644
--- a/swamid-2.0/eduvpn.sunet.se-shibboleth.xml
+++ b/swamid-2.0/eduvpn.sunet.se-shibboleth.xml
@@ -24,9 +24,9 @@
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/epc.ub.uu.se-shibboleth.xml b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
index 60663f72..1f879452 100644
--- a/swamid-2.0/epc.ub.uu.se-shibboleth.xml
+++ b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
@@ -12,7 +12,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://epc.ub.uu.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://epc.ub.uu.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml b/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
index 36ef7701..76c3843a 100644
--- a/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://esi.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = https://myacademicid.org/entity-categories/esi-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/etenta.math.su.se-shibboleth.xml b/swamid-2.0/etenta.math.su.se-shibboleth.xml
index d6c2ad84..478b5868 100644
--- a/swamid-2.0/etenta.math.su.se-shibboleth.xml
+++ b/swamid-2.0/etenta.math.su.se-shibboleth.xml
@@ -146,8 +146,6 @@ QUYfhLzUYuNWskoLQLCXtieByzsjSJGSPQ==
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <!-- ORGANIZATION INFO -->
-  <!-- CONTACTS -->
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SU, Matematiska institutionen</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SU, Department of Mathematics </md:OrganizationName>
diff --git a/swamid-2.0/eu1.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml b/swamid-2.0/eu1.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
index d3d13379..eab43642 100644
--- a/swamid-2.0/eu1.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
+++ b/swamid-2.0/eu1.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">itslearning</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">itslearning</mdui:DisplayName>
@@ -22,8 +22,8 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHLjCCBhagAwIBAgIQX7GyA83zvyAJsCXcc941yjANBgkqhkiG9w0BAQsFADCB
@@ -67,8 +67,8 @@ aWOwP8hiEiN95Vx9R6R+Zz4uYg8HFHB4PvQBHEVXajZ7Tf+EX56Ixar+lOI2zzrH
 YKlCAjUJdoo5mc2UCRIvaTQF</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHLjCCBhagAwIBAgIQX7GyA83zvyAJsCXcc941yjANBgkqhkiG9w0BAQsFADCB
@@ -112,26 +112,26 @@ aWOwP8hiEiN95Vx9R6R+Zz4uYg8HFHB4PvQBHEVXajZ7Tf+EX56Ixar+lOI2zzrH
 YKlCAjUJdoo5mc2UCRIvaTQF</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eu1.itslearning.com/elogin/SingleLogoutHandler.aspx"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu1.itslearning.com/eLogin/AssertionConsumerService.aspx"/>
-    <AttributeConsumingService index="1">
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eu1.itslearning.com/elogin/SingleLogoutHandler.aspx"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu1.itslearning.com/eLogin/AssertionConsumerService.aspx"/>
+    <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
-      <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="eppn" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">itslearning</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">itslearning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://itslearning.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="eppn" 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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">itslearning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">itslearning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://itslearning.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xml:lang="en" contactType="technical">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xml:lang="en" contactType="support">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/examensansokan.portal.chalmers.se.xml b/swamid-2.0/examensansokan.portal.chalmers.se.xml
index 7e67e2cd..32784436 100644
--- a/swamid-2.0/examensansokan.portal.chalmers.se.xml
+++ b/swamid-2.0/examensansokan.portal.chalmers.se.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://examensansokan.portal.chalmers.se">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-18T16:10:23Z">
diff --git a/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml b/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
index 085e512d..76e1fae3 100644
--- a/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
@@ -91,28 +91,28 @@ kGv/tac9fcTDGjZ7
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.demo.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Swedish Council for Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">www.uhr.se</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">www.uhr.se/en</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>HÃ¥kan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>HÃ¥kan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml b/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
index 198e3d73..96ab2daa 100644
--- a/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
@@ -92,28 +92,28 @@ pTz2pvp6H+wCW7E=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Swedish Council for Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">www.uhr.se</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">www.uhr.se/en</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>HÃ¥kan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>HÃ¥kan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/expert.stage.antagning.se-expert-sp.xml b/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
index 99cdfafa..a264d8ce 100644
--- a/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
+++ b/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
@@ -91,29 +91,29 @@ f1cDewNLTKiWGbUkZ9Y8Fw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.stage.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.stage.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Swedish Council for Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se/en</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>HÃ¥kan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>HÃ¥kan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml b/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
index ddb8a6de..1e0e1b9e 100644
--- a/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
@@ -91,29 +91,29 @@ ypVCZ86nE2K76dkQ2zhOD5qKrFYtl71Nak6Rm81UIA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.stage.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.stage.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Swedish Council for Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se/en</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>HÃ¥kan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish Council for Higher Education</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>HÃ¥kan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish Council for Higher Education</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml b/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
index b58fa637..4376b15c 100644
--- a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://expert.test.antagning.se/ecs-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-18T11:08:19Z">
diff --git a/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
index 60981d01..746dc252 100644
--- a/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
+++ b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
@@ -4,58 +4,58 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-02-27T07:53:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/hide-from-discovery</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Pythagoras Web</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Pythagoras Web</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Hantering av information relaterad till byggnader vid Lunds universitet</mdui:Description>
         <mdui:Description xml:lang="en">Management of information related to buildings at Lund University</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC3jCCAcagAwIBAgIQaMSNyxA5n4VBKwc1kO+5OzANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBmcy52ZW1lbmRvLm5ldDAeFw0xNzExMjUwMDExMTdaFw00NzExMTgwMDExMTdaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGZzLnZlbWVuZG8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1cXWTuawK3E5m2kj1uUz7SVTB6X4aNglBVzUoMuS5zzuWKh8YIExlody+/+QMm00emYdnzkkxvvqWyYSZhgtj3CdRpaj/NVjIc7M3kakQj59gw76qFGehKmutb1al9RqrL7l6T9Fa4RJkTh6cCmdzU8lh2CKZPQrbnYPmh2P+BLpzIemqXNJy6HFr/usNB2KJQcqrR0roIdDm7o4qLUEYEYhqqlw0YdClTk0YACpwAT4XfSNes3XCHu+n53zK8k+HFRBWw0RC1h6MQwPIVL3FqsjxECeLeXQ0zZBGOCZZagh0muwUJjt+A6ynnjnDCTwAQhJ2/YEOOrdB0F03RxtQwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBNa+r2L5Yszr8EnV9kIzLVPXS5pzKBiMFj3ZU11ycZ9o5xrzenyqsVH2XMAEOkSWVVM84Nl+6NFkchutyQ4oCzifbkDEHscekHj4atq0vHOQPHcRz2kV4N4ntQdNormHUUHBgjtZh/Ia9FXEmV6HSlm/XVWk0CWWcupaqNX9SC6biE1F5e7F8TwCibPzzKi4oS+4fx87GQoI69PSrEZovfVE9YTCs1K3On5ttUgzcvifFnjNqtFjO55KYSLg2ngtGMdonEOiQgKNVnn/5GhDxJ1H6q3ZEZdlHh3tjkx+O/1nRpIyfcTfxlLa5xdyVxZ/tppS6bX2iQUR3VYI6J9LTr</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQdQDEP+8zH75CmI+0PbZyxTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBmcy52ZW1lbmRvLm5ldDAeFw0xNzExMjUwMDExMTdaFw00NzExMTgwMDExMTdaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGZzLnZlbWVuZG8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3AhdaaXA8ukj+ayfPVfFx+QGoFG9QDnFger3lNtvVqHXUsqiDBfI/SEvr04sC/OBMvsWjcBwOw/c5P/nEEkTavXYc/0PLd1lGYv+zwEKhBxKo1egHeExqDsh1Ci2DQux7gS9X514REO5XaTf8JvRKVKkpE+Y8ASsrZSp+YGJ63A36bicfKx++6fD2e6MfllPeevNoDWxCX75QPVKgQDW/tT5C9fGd/sA7aNDGMXf39x2LZmdeP0sYiQN0HkeflQlu8CYR6n0Ua5WyKpaax4TXYCPg9snDb0ICFJXnF2SWzwrjy96qQDK9HEPOB2uaB2q/Z3F6hY06wrPSP/XsmkBcQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAmz18QNZQwi8pVMrGuiujj6iau0pPbc16hg1mT7gTQ6n+PHmydmsYWUxvu16zz9bDFMrrkNUmbJO+o+FcFUKlLQKrZ2znjuKol64sfLlJgliCpRxRDj/ovVlR0zY1YgLu53IKmqzd0H7ZXneWPQpY5qopa9DtnsG5xSG04W9rbN0lMf4LNlOMiAJfGc46KZhrWOEB9O/v02Y+nGTuSiIuhvyOGDJ17r/+DvKZlovIrLKo+E6CN8PTsBOyebi4MogEaUbPRsARy1ts1wTipZD8lm8rK0MK01TC2U+tMb9dEsSLIBObJdLz8Hx+20JAj9r+Ue6RYt1zrNaGhuEG8OVkm</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.vemendo.net/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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://fs.vemendo.net/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.vemendo.net/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Jan</GivenName>
-    <SurName>Aldoson</SurName>
-    <EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
-    <TelephoneNumber>+46462220467</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Jan</GivenName>
-    <SurName>Aldoson</SurName>
-    <EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
-    <TelephoneNumber>+46462220467</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC3jCCAcagAwIBAgIQaMSNyxA5n4VBKwc1kO+5OzANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBmcy52ZW1lbmRvLm5ldDAeFw0xNzExMjUwMDExMTdaFw00NzExMTgwMDExMTdaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGZzLnZlbWVuZG8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1cXWTuawK3E5m2kj1uUz7SVTB6X4aNglBVzUoMuS5zzuWKh8YIExlody+/+QMm00emYdnzkkxvvqWyYSZhgtj3CdRpaj/NVjIc7M3kakQj59gw76qFGehKmutb1al9RqrL7l6T9Fa4RJkTh6cCmdzU8lh2CKZPQrbnYPmh2P+BLpzIemqXNJy6HFr/usNB2KJQcqrR0roIdDm7o4qLUEYEYhqqlw0YdClTk0YACpwAT4XfSNes3XCHu+n53zK8k+HFRBWw0RC1h6MQwPIVL3FqsjxECeLeXQ0zZBGOCZZagh0muwUJjt+A6ynnjnDCTwAQhJ2/YEOOrdB0F03RxtQwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBNa+r2L5Yszr8EnV9kIzLVPXS5pzKBiMFj3ZU11ycZ9o5xrzenyqsVH2XMAEOkSWVVM84Nl+6NFkchutyQ4oCzifbkDEHscekHj4atq0vHOQPHcRz2kV4N4ntQdNormHUUHBgjtZh/Ia9FXEmV6HSlm/XVWk0CWWcupaqNX9SC6biE1F5e7F8TwCibPzzKi4oS+4fx87GQoI69PSrEZovfVE9YTCs1K3On5ttUgzcvifFnjNqtFjO55KYSLg2ngtGMdonEOiQgKNVnn/5GhDxJ1H6q3ZEZdlHh3tjkx+O/1nRpIyfcTfxlLa5xdyVxZ/tppS6bX2iQUR3VYI6J9LTr</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQdQDEP+8zH75CmI+0PbZyxTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBmcy52ZW1lbmRvLm5ldDAeFw0xNzExMjUwMDExMTdaFw00NzExMTgwMDExMTdaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGZzLnZlbWVuZG8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3AhdaaXA8ukj+ayfPVfFx+QGoFG9QDnFger3lNtvVqHXUsqiDBfI/SEvr04sC/OBMvsWjcBwOw/c5P/nEEkTavXYc/0PLd1lGYv+zwEKhBxKo1egHeExqDsh1Ci2DQux7gS9X514REO5XaTf8JvRKVKkpE+Y8ASsrZSp+YGJ63A36bicfKx++6fD2e6MfllPeevNoDWxCX75QPVKgQDW/tT5C9fGd/sA7aNDGMXf39x2LZmdeP0sYiQN0HkeflQlu8CYR6n0Ua5WyKpaax4TXYCPg9snDb0ICFJXnF2SWzwrjy96qQDK9HEPOB2uaB2q/Z3F6hY06wrPSP/XsmkBcQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAmz18QNZQwi8pVMrGuiujj6iau0pPbc16hg1mT7gTQ6n+PHmydmsYWUxvu16zz9bDFMrrkNUmbJO+o+FcFUKlLQKrZ2znjuKol64sfLlJgliCpRxRDj/ovVlR0zY1YgLu53IKmqzd0H7ZXneWPQpY5qopa9DtnsG5xSG04W9rbN0lMf4LNlOMiAJfGc46KZhrWOEB9O/v02Y+nGTuSiIuhvyOGDJ17r/+DvKZlovIrLKo+E6CN8PTsBOyebi4MogEaUbPRsARy1ts1wTipZD8lm8rK0MK01TC2U+tMb9dEsSLIBObJdLz8Hx+20JAj9r+Ue6RYt1zrNaGhuEG8OVkm</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.vemendo.net/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.vemendo.net/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.vemendo.net/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Aldoson</md:SurName>
+    <md:EmailAddress>mailto:jan.aldoson@bygg.lu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46462220467</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Aldoson</md:SurName>
+    <md:EmailAddress>mailto:jan.aldoson@bygg.lu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46462220467</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml b/swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
index a338cc84..cab87ab3 100644
--- a/swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
+++ b/swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
@@ -10,20 +10,20 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gitlab.fysik.su.se/swamidproxy/disco" index="1"/>
-      <ns2:UIInfo xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui">
-        <ns2:DisplayName xml:lang="en">Fysikum Gitlab</ns2:DisplayName>
-        <ns2:Description xml:lang="en">Gitlab version control service for Fysikum at Stockholm University</ns2:Description>
-        <ns2:InformationURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/gitlab</ns2:InformationURL>
-        <ns2:PrivacyStatementURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/gitlab</ns2:PrivacyStatementURL>
-      </ns2:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIDDTCCAfWgAwIBAgIUceEae1qy6s0evAJiI8SFeIvw5sowDQYJKoZIhvcNAQEL
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gitlab.fysik.su.se/swamidproxy/disco" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Fysikum Gitlab</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gitlab version control service for Fysikum at Stockholm University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/gitlab</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/gitlab</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIUceEae1qy6s0evAJiI8SFeIvw5sowDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLZnlzaWsuc3Uuc2UwHhcNMjEwMjA5MDgzOTIxWhcNMzEw
 MjA3MDgzOTIxWjAWMRQwEgYDVQQDDAtmeXNpay5zdS5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAN4w05kBX8MyH67s+8gZMZ3dJKp0GAVK3TEYwuVc
@@ -40,14 +40,14 @@ sgbxt7ZksKfH3sJ0bTlfIlMGb9ekaVbXolNdQOXPM9vh36/nANy0DAWB9lmCMVhp
 w5h/FiB+Ekr0VdVMPg2cWhSzl+iIfQS9RFbZLGthwbal/NMYcZLM5bBU+FFyssWc
 iE5Bsy5LCIS3+4nDKZGPKiYv1gpb/8rktUEQQE8yZskovdRF1VQg3ooT7enjJG/Z
 rl1vDdOSp3KzuoZsaikbcJE=
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIDDTCCAfWgAwIBAgIUabOWu51DaQv4g8C5nTpVGfHVA5UwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIUabOWu51DaQv4g8C5nTpVGfHVA5UwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLZnlzaWsuc3Uuc2UwHhcNMjEwMjA5MDgzOTIxWhcNMzEw
 MjA3MDgzOTIxWjAWMRQwEgYDVQQDDAtmeXNpay5zdS5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAMJnZd6HSGWyggWODHozsDvZeN2rLP/liaG/B7GB
@@ -64,13 +64,13 @@ oyuNYOzV4qhixNSP0ZbCqi7I/ucG7dM85s6CF1I4FzDgdSUWXdWNmJzPVkTgGufo
 +W3ANL8PL1bcpUjakJfekKVBgcFsQtJC1Vs1KPu35dCoq6YT0yRx5kX3fbbMeQVo
 3Jxu4j3RRutM2VpiWgLqwPXD4tk2WQKut/OgELX/Xox44dEFdv4UfmIXUgekLBGB
 es55lJTi6JO0uz/1fmpfswc=
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.fysik.su.se/swamidproxy/acs/post" index="1"/>
-  </ns0:SPSSODescriptor>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.fysik.su.se/swamidproxy/acs/post" index="1"/>
+  </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Fysikum, Stockholms Universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Fysikum, Stockholms Universitet</md:OrganizationDisplayName>
diff --git a/swamid-2.0/graylog.sunet.se-shibboleth.xml b/swamid-2.0/graylog.sunet.se-shibboleth.xml
index 2aa85734..4c4afcf2 100644
--- a/swamid-2.0/graylog.sunet.se-shibboleth.xml
+++ b/swamid-2.0/graylog.sunet.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://graylog.sunet.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-03-12T11:39:38Z">
diff --git a/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml b/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
index 3a80389e..e1b58fd7 100644
--- a/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
+++ b/swamid-2.0/grr.cert.sunet.se-8443-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://grr.cert.sunet.se:8443/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-12-01T16:03:09Z">
diff --git a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
index 0dc9e2cf..240301b1 100644
--- a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
@@ -228,8 +228,6 @@ YPbGFDgtXE/LKeKsvKgyQIfKUW8=
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
diff --git a/swamid-2.0/hhs-se.zoom.us.xml b/swamid-2.0/hhs-se.zoom.us.xml
index 02de58c5..02925733 100644
--- a/swamid-2.0/hhs-se.zoom.us.xml
+++ b/swamid-2.0/hhs-se.zoom.us.xml
@@ -23,7 +23,6 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://ex.hhs.se/SWAMID/sp/zoom/ZoomPrivacyEN.htm</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <!-- NEW certs for 2022-2023 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -102,7 +101,6 @@ mYIp+qov+EzUDeCQ
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- OLD certs expires 2022-02-02 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
diff --git a/swamid-2.0/hr.su.se-shibboleth.xml b/swamid-2.0/hr.su.se-shibboleth.xml
index 0572c9f3..7898c702 100644
--- a/swamid-2.0/hr.su.se-shibboleth.xml
+++ b/swamid-2.0/hr.su.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://hr.su.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-01-30T14:01:21Z">
diff --git a/swamid-2.0/hrm.flexhosting.se-hrm-.xml b/swamid-2.0/hrm.flexhosting.se-hrm-.xml
index cb2c50fa..17016edf 100644
--- a/swamid-2.0/hrm.flexhosting.se-hrm-.xml
+++ b/swamid-2.0/hrm.flexhosting.se-hrm-.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Uppsala universitets Flex HRM</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Uppsala University Flex HRM</mdui:DisplayName>
@@ -17,50 +17,50 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://hrm.flexhosting.se/HRM/Public/CookiePolicy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://hrm.flexhosting.se/HRM/Public/CookiePolicy/EN</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIGPjCCBSagAwIBAgIJALyTMIQDWo8RMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTIwMTIyMzE0MDAyMFoXDTIyMDExOTA3MzA1NlowPjEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDDBAqLmZsZXhob3N0aW5nLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwNR4ZHGJk9OgfSAlTh+wbEdux1+37yfTh09tnN3WPf/oDqxN13P9sk00WTASuGNl00lyyk44CqadtO+bvJtoDQANfUcfvXhEp/vZcrPjzDWt+vOANnjHz/xDcileproDCIZByQZk0yvxkETM+dnpg9+XEJ7jH+/zvIVe5GNOR9v3NytDBaEh2Nn2ikP04Zy5etazFE+K7FDy4wKkiqldVJDqOYIQ/fdpmyQ31kov1NL1NfsK5IOQGN0VB4BT9z+JRE087TFY863ueAW/wD8wsFJH8Ie/g6NI/jeRBI/IgrNaJ+9RAXF/3qCcEJ7Qy1xtudoBEsmLTELfB7JEHlnKPQIDAQABo4ICxjCCAsIwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RpZzJzMS0yNTU2LmNybDBdBgNVHSAEVjBUMEgGC2CGSAGG/W0BBxcBMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeOzDSDMKIz1/tss/C0LIDOMCsGA1UdEQQkMCKCECouZmxleGhvc3Rpbmcuc2WCDmZsZXhob3N0aW5nLnNlMB0GA1UdDgQWBBTTwqDDicMxEChsZz5YaUFacn9IMzCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2ACl5vvCeOTkh8FZzn2Old+W+V32cYAr4+U1dJlwlXceEAAABdo/mlSsAAAQDAEcwRQIhAKvSp4H2B+Hob75I/qt7jRaY0N4NRN8xTImCJ+69iWEwAiB+bDUcVkA7T/MDwd456O1lCfnHLIhmcU70m+/vV3FdGQB1ACJFRQdZVSRWlj+hL/H3bYbgIyZjrcBLf13Gg1xu4g8CAAABdo/mlmcAAAQDAEYwRAIgehMIeZsaBn7VE83BP/QzRYXt9fdmJr9Ch9R8qbt1afoCIGiHGN2XAzp/SJuafjm5a3fNRl+6pLiyG3988m59hF1NMA0GCSqGSIb3DQEBCwUAA4IBAQAhreVXbvyr4IJUY5c68lWRFQ4VasdPRRdk7f+uXHxmIrbgC6h/7tARg0nXHQwYkG+arFC6K3Yvuo6u2HSa4dEtktdGoEHdAT34WVlnYcXYcQRaA3CNq5nEo7ZggGvmjdsXXyjcowiOKhgMrXicIIBXDwN8jAEL2DB6m8WNwq3Ls4Si8nxDjA0SP/xLJ3sBDdRIZIaARGTTwNNDXAP6CUaW84UETpHh9sFiaw9oCTiRKKbY7/oag12p6RIkq36JeujjHJkD7P0a4bZ0uAR8upCpbkQ6e7CcsoS5WDOE8Y6tMPfpy18phSZW5SaIuKCOSfHg8eJYs5QTl7CklMh4c9Q9</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hrm.flexhosting.se/HRM/Saml2/Logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="true" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="false" index="1"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Flex Applications Sverige AB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Flex Applications</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.flexapplications.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Flex Applications</Company>
-    <EmailAddress>mailto:tekniskkonsulting@flexapplications.se</EmailAddress>
-    <TelephoneNumber>+4619103915</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Flex Applications</Company>
-    <SurName>HRM Time Support</SurName>
-    <EmailAddress>mailto:time.support@flexapplications.se</EmailAddress>
-    <TelephoneNumber>+4619103915</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Flex Applications</Company>
-    <SurName>HRM Travel Support</SurName>
-    <EmailAddress>mailto:travel.support@flexapplications.se</EmailAddress>
-    <TelephoneNumber>+4619103915</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Flex Applications</Company>
-    <SurName>HRM Employee Support</SurName>
-    <EmailAddress>mailto:employee.support@flexapplications.se</EmailAddress>
-    <TelephoneNumber>+4619103915</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Flex Applications</Company>
-    <SurName>HRM Payroll Support</SurName>
-    <EmailAddress>mailto:payroll.support@flexapplications.se</EmailAddress>
-    <TelephoneNumber>+4619103915</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGPjCCBSagAwIBAgIJALyTMIQDWo8RMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTIwMTIyMzE0MDAyMFoXDTIyMDExOTA3MzA1NlowPjEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDDBAqLmZsZXhob3N0aW5nLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwNR4ZHGJk9OgfSAlTh+wbEdux1+37yfTh09tnN3WPf/oDqxN13P9sk00WTASuGNl00lyyk44CqadtO+bvJtoDQANfUcfvXhEp/vZcrPjzDWt+vOANnjHz/xDcileproDCIZByQZk0yvxkETM+dnpg9+XEJ7jH+/zvIVe5GNOR9v3NytDBaEh2Nn2ikP04Zy5etazFE+K7FDy4wKkiqldVJDqOYIQ/fdpmyQ31kov1NL1NfsK5IOQGN0VB4BT9z+JRE087TFY863ueAW/wD8wsFJH8Ie/g6NI/jeRBI/IgrNaJ+9RAXF/3qCcEJ7Qy1xtudoBEsmLTELfB7JEHlnKPQIDAQABo4ICxjCCAsIwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgWgMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RpZzJzMS0yNTU2LmNybDBdBgNVHSAEVjBUMEgGC2CGSAGG/W0BBxcBMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeOzDSDMKIz1/tss/C0LIDOMCsGA1UdEQQkMCKCECouZmxleGhvc3Rpbmcuc2WCDmZsZXhob3N0aW5nLnNlMB0GA1UdDgQWBBTTwqDDicMxEChsZz5YaUFacn9IMzCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2ACl5vvCeOTkh8FZzn2Old+W+V32cYAr4+U1dJlwlXceEAAABdo/mlSsAAAQDAEcwRQIhAKvSp4H2B+Hob75I/qt7jRaY0N4NRN8xTImCJ+69iWEwAiB+bDUcVkA7T/MDwd456O1lCfnHLIhmcU70m+/vV3FdGQB1ACJFRQdZVSRWlj+hL/H3bYbgIyZjrcBLf13Gg1xu4g8CAAABdo/mlmcAAAQDAEYwRAIgehMIeZsaBn7VE83BP/QzRYXt9fdmJr9Ch9R8qbt1afoCIGiHGN2XAzp/SJuafjm5a3fNRl+6pLiyG3988m59hF1NMA0GCSqGSIb3DQEBCwUAA4IBAQAhreVXbvyr4IJUY5c68lWRFQ4VasdPRRdk7f+uXHxmIrbgC6h/7tARg0nXHQwYkG+arFC6K3Yvuo6u2HSa4dEtktdGoEHdAT34WVlnYcXYcQRaA3CNq5nEo7ZggGvmjdsXXyjcowiOKhgMrXicIIBXDwN8jAEL2DB6m8WNwq3Ls4Si8nxDjA0SP/xLJ3sBDdRIZIaARGTTwNNDXAP6CUaW84UETpHh9sFiaw9oCTiRKKbY7/oag12p6RIkq36JeujjHJkD7P0a4bZ0uAR8upCpbkQ6e7CcsoS5WDOE8Y6tMPfpy18phSZW5SaIuKCOSfHg8eJYs5QTl7CklMh4c9Q9</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hrm.flexhosting.se/HRM/Saml2/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="false" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Flex Applications Sverige AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Flex Applications</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.flexapplications.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Flex Applications</md:Company>
+    <md:EmailAddress>mailto:tekniskkonsulting@flexapplications.se</md:EmailAddress>
+    <md:TelephoneNumber>+4619103915</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Flex Applications</md:Company>
+    <md:SurName>HRM Time Support</md:SurName>
+    <md:EmailAddress>mailto:time.support@flexapplications.se</md:EmailAddress>
+    <md:TelephoneNumber>+4619103915</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Flex Applications</md:Company>
+    <md:SurName>HRM Travel Support</md:SurName>
+    <md:EmailAddress>mailto:travel.support@flexapplications.se</md:EmailAddress>
+    <md:TelephoneNumber>+4619103915</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Flex Applications</md:Company>
+    <md:SurName>HRM Employee Support</md:SurName>
+    <md:EmailAddress>mailto:employee.support@flexapplications.se</md:EmailAddress>
+    <md:TelephoneNumber>+4619103915</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Flex Applications</md:Company>
+    <md:SurName>HRM Payroll Support</md:SurName>
+    <md:EmailAddress>mailto:payroll.support@flexapplications.se</md:EmailAddress>
+    <md:TelephoneNumber>+4619103915</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml b/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml
index 57ee8d21..3c2690a5 100644
--- a/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://humhub-idp-proxy.sunet.se/sp">
   <md:Extensions>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-03-01T16:44:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
@@ -31,20 +31,20 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns3:DiscoveryResponse xmlns:ns3="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://humhub-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://humhub-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SUNET Forum</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SUNET Forum</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Sunets samverkansplattform baserad på humhub.</mdui:Description>
         <mdui:Description xml:lang="en">Sunet's communityplatform based on humhub.</mdui:Description>
       </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUEY/k5aGq4fj0a8J9RM7NxyZLiHwwDQYJKoZIhvcNAQEL
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUEY/k5aGq4fj0a8J9RM7NxyZLiHwwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjEwMjI2MTE0NTEwWhcN
 MzEwMjI0MTE0NTEwWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBALnOG8u5LTVAG/O0WJ6PBMfoD1S43f/F
@@ -72,14 +72,14 @@ jQ1RYJCW+mJP9I6x8BYJ3iw68WeqalTAOvXJnIABtPM3kLE9qN0uTMwvC+UNlklb
 vnjcs9f0FPWkkB8h83cWTjcvbRUjEoMSV3fK/Els/Cq333NK8ZGVUcrVj7UlCRO/
 xG08Y2bY1nmvUX1Ij9GUSjGoWN40mtv+Ylygh7s9RJckF/knjLLWPwH9QJxbVJRE
 Z4bbO2ahcQ==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUEY/k5aGq4fj0a8J9RM7NxyZLiHwwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUEY/k5aGq4fj0a8J9RM7NxyZLiHwwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjEwMjI2MTE0NTEwWhcN
 MzEwMjI0MTE0NTEwWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBALnOG8u5LTVAG/O0WJ6PBMfoD1S43f/F
@@ -107,32 +107,32 @@ jQ1RYJCW+mJP9I6x8BYJ3iw68WeqalTAOvXJnIABtPM3kLE9qN0uTMwvC+UNlklb
 vnjcs9f0FPWkkB8h83cWTjcvbRUjEoMSV3fK/Els/Cq333NK8ZGVUcrVj7UlCRO/
 xG08Y2bY1nmvUX1Ij9GUSjGoWN40mtv+Ylygh7s9RJckF/knjLLWPwH9QJxbVJRE
 Z4bbO2ahcQ==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humhub-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://humhub-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
-    <ns0:AttributeConsumingService index="1">
-      <ns0:ServiceName xml:lang="en">SUNET Forum</ns0:ServiceName>
-      <ns0: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"/>
-      <ns0: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"/>
-      <ns0:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <ns0:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <ns0: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"/>
-    </ns0:AttributeConsumingService>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">SUNET Forum</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">SUNET Forum</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humhub-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://humhub-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SUNET Forum</md:ServiceName>
+      <md: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"/>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md: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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET Forum</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET Forum</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/id.easyvote.se-saml2-lucat.xml b/swamid-2.0/id.easyvote.se-saml2-lucat.xml
index ca804c93..4edfcae6 100644
--- a/swamid-2.0/id.easyvote.se-saml2-lucat.xml
+++ b/swamid-2.0/id.easyvote.se-saml2-lucat.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Online elections at Lund University</mdui:DisplayName>
@@ -19,31 +19,31 @@
         <mdui:Description xml:lang="sv">Lunds universitets verktygsstöd för att genomföra elektroniska val</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDSzCCAjOgAwIBAgIQH/QE7JE0p4NCR3CJ5+5KvTANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBppZC5zYW1sMi5sdWNhdC5lYXN5dm90ZS5zZTAeFw0yMDA0MDgwODM4MzNaFw0yNTA0MDgwODQ4MzRaMCUxIzAhBgNVBAMMGmlkLnNhbWwyLmx1Y2F0LmVhc3l2b3RlLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqldo+Ktl62Owjbd1Qq16LmM9bhSNf35astdY275XIP/9nHT3DVl6Ph08dMsmso+CDoIwV1EWcYNgMkkICoOQ3JOiANMD6cy/YKSJGoF/8MFlchWMlTgjnVy7sn4VjwDXlFd/AE0R+cyZRVTE/2JSFD1KMFGjZrjUbkNZrH76hACWn8y24mVwxBlbVwljtS6XOSbo7F4N+nsat1YrkPUXDZ6wxjG6iaNs6lHXnT5GT28ahEnP+mlh6k4O2Uob/cH7f18BYoFcF0sJL1FW/XmyVu2psfrCrTwgv9Iz70x4DFtkcONrwFrYIuc0VNR2+Gp+L6qmH7iCfEKKYgxKb4hFIQIDAQABo3cwdTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMCUGA1UdEQQeMByCGmlkLnNhbWwyLmx1Y2F0LmVhc3l2b3RlLnNlMB0GA1UdDgQWBBTmUxcpw78zY5acQl+TymoyDe8/mjANBgkqhkiG9w0BAQsFAAOCAQEAC2eFzCLm3KiL65E5MO3xbaN+b+te+QhfWdYeXJ8zXA3NMCmMh1f3Jfz0JdPOT/EOhA2N1bOOcX7D1EYlu3DXbrHsU/pUIG5iANtDgALeVCtbzBKcBJv38RUL3claNViKuyGXArNAUyZapJpsPSuK6gtEpwHfeQTKDmS3Ro+vIFxn2O4bMNeTe9ZDB3MRSe3bQYQJ9YHJKEOwy00mBXK0ZsYwJf2UsjvZIB3AJA9Dkr9mldBmHhJtDcgd6dL7njb9yYSrMVMkapMPynKftH+N6ILA5FYxQdi7lgzY8kN4yPWiaKsEJwUMlc+RRrNui7eWCQO5GuY0pbFMJiuuEvE4Eg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.easyvote.se/Saml2-Lucat/Logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.easyvote.se/Saml2-Lucat/Acs" isDefault="true" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.easyvote.se/Saml2-Lucat/Acs" isDefault="false" index="1"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Lund University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.lu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Eskil Swahn</GivenName>
-    <EmailAddress>mailto:eskil.swahn@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Anna Åkesson</GivenName>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Servicedesk</GivenName>
-    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDSzCCAjOgAwIBAgIQH/QE7JE0p4NCR3CJ5+5KvTANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBppZC5zYW1sMi5sdWNhdC5lYXN5dm90ZS5zZTAeFw0yMDA0MDgwODM4MzNaFw0yNTA0MDgwODQ4MzRaMCUxIzAhBgNVBAMMGmlkLnNhbWwyLmx1Y2F0LmVhc3l2b3RlLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqldo+Ktl62Owjbd1Qq16LmM9bhSNf35astdY275XIP/9nHT3DVl6Ph08dMsmso+CDoIwV1EWcYNgMkkICoOQ3JOiANMD6cy/YKSJGoF/8MFlchWMlTgjnVy7sn4VjwDXlFd/AE0R+cyZRVTE/2JSFD1KMFGjZrjUbkNZrH76hACWn8y24mVwxBlbVwljtS6XOSbo7F4N+nsat1YrkPUXDZ6wxjG6iaNs6lHXnT5GT28ahEnP+mlh6k4O2Uob/cH7f18BYoFcF0sJL1FW/XmyVu2psfrCrTwgv9Iz70x4DFtkcONrwFrYIuc0VNR2+Gp+L6qmH7iCfEKKYgxKb4hFIQIDAQABo3cwdTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMCUGA1UdEQQeMByCGmlkLnNhbWwyLmx1Y2F0LmVhc3l2b3RlLnNlMB0GA1UdDgQWBBTmUxcpw78zY5acQl+TymoyDe8/mjANBgkqhkiG9w0BAQsFAAOCAQEAC2eFzCLm3KiL65E5MO3xbaN+b+te+QhfWdYeXJ8zXA3NMCmMh1f3Jfz0JdPOT/EOhA2N1bOOcX7D1EYlu3DXbrHsU/pUIG5iANtDgALeVCtbzBKcBJv38RUL3claNViKuyGXArNAUyZapJpsPSuK6gtEpwHfeQTKDmS3Ro+vIFxn2O4bMNeTe9ZDB3MRSe3bQYQJ9YHJKEOwy00mBXK0ZsYwJf2UsjvZIB3AJA9Dkr9mldBmHhJtDcgd6dL7njb9yYSrMVMkapMPynKftH+N6ILA5FYxQdi7lgzY8kN4yPWiaKsEJwUMlc+RRrNui7eWCQO5GuY0pbFMJiuuEvE4Eg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.easyvote.se/Saml2-Lucat/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.easyvote.se/Saml2-Lucat/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.easyvote.se/Saml2-Lucat/Acs" isDefault="false" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eskil Swahn</md:GivenName>
+    <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anna Åkesson</md:GivenName>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
index a6fd13d4..d47e0d59 100644
--- a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities</mdui:DisplayName>
@@ -20,29 +20,29 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC4DCCAcigAwIBAgIQUhzepSv2k7VIz2bMvP2E+DANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIEVuY3J5cHRpb24gLSBpZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUzODIxWhcNMjQwODE1MDUzODIxWjAsMSowKAYDVQQDEyFBREZTIEVuY3J5cHRpb24gLSBpZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqxqQwCXMrTs3gdJJmhMuaNl9OjG+XFd/N5gMqvFxh7YmuxyHyWr4mTuUcgp43WlBwypJ318N6Xr3PY+hZPYJjz58ou3JLTgIu5CxxvlzPP3qN/mppW9dVPHE4RQ3ybGKonpeHBvJqLe9QKMw+eVPq8IwsRtQGhIYTQRYRbrTmTWh+nJNaj6nQ2J0qVCZYzkFJntqhotxGjj8MKtT34RWxGStZKA9aUW2uMr5dKDF1THuYmAveVxumAcAObsm3y6ryKDseF0LRUXteh4estWh7yjjFtuhmYtX7dSYayfeQ2LBYGC8M02g1Vt5U9ShnGCTTrqVyqTeN8dWiaR6SALZ7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAES6q7nPMBVaAFXwWxCauRVa9BndgCeWx8ihXuE10PAx8fIOmrGPsYdHcX5yBVtJFqF6cg/dYaU7cja2Rmxp7EVwjt/JGoSgJ08V/0Ab36NFZO7MK4DGUxwqjjXXU476oEfInlNvAW4fEB+66X5B4NI4bHozdLVLLnpV8W1N/z3uOxWknoI+4+G4Cpn1/CqLW10R98jCX7MGYbxTLm5sARFwNhUsXrUa+7e8FN1E+UpKfp0PUzNMVJxfW3k6y5jJrmeJYgVaV8JvoVsoKD8zjN/XmExrhhrSN/giHr6cRpjgFKMkDhNYedkcHL9RwmXXxoWI6z5F5C/0Zj3jbJpUuWE=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC2jCCAcKgAwIBAgIQKSx3hQQhGrRC0NhtF+YWmDANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUzNzU1WhcNMjQwODE1MDUzNzU1WjApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCQjhfSS7MmszSlgTT/2cCywh2jogm4gEMBcYwLVeR9qnKinYuFuqzLMS2L2+3Yhx6XcjGviNXIxkSjUv8YwAXusBKgOILFm+bp5NJWCbTxp5maaAAua1TtDi/wfm2VRQ3hITdQemJi05xL5rO8M1rgELrljNM4vXfc/bFSvpLDiKFfyPYU2DleORP1tesWdNv0d8603gthsTzJk5/TV+c6TLWI38FGNJcQqernVQPrxsNDrpGneYb+oMFhCgMI04GnS48uSFmYgeTXmD5peeUeMWLTYyG3RCpqdThG9HUEwr6KKk25/kyTS4D+3N8YNdIo4DjMDeypbDI3MSEZ4t3AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKzmx1KLEoXd7D07WlKAndKYsK7zoyWf0l8UaEWvThtBPXrJErMC3nHMr8IdHPC32faPsKZO9QwFJylbck1SFuj+rNoC+BPOB97JLiD+qLUl7oaRG0VZIw7nOxEWEBiQdJn5padzUp8PyLJya/bLB74oLojf7W07rgR+QdT0rIX7k1CbW3KN+mpbGI1xigu2QgAiZHohubJdzHhlc6smXC+STrlm3UfSh9CGs1bxc8FruAVgyTcQGerlHu/O2w/hX6l9JWII7fQkHLuHN2eIVWW8q6Ye4cPYf1xqtmzIqF7Mi7yGQzFm5DQTvgVyxI0DlpGC9IYqZh5qjnU/5hnUce4=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.statenssc.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.statenssc.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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://id.statenssc.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.statenssc.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.statenssc.se/adfs/ls/" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC4DCCAcigAwIBAgIQUhzepSv2k7VIz2bMvP2E+DANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIEVuY3J5cHRpb24gLSBpZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUzODIxWhcNMjQwODE1MDUzODIxWjAsMSowKAYDVQQDEyFBREZTIEVuY3J5cHRpb24gLSBpZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqxqQwCXMrTs3gdJJmhMuaNl9OjG+XFd/N5gMqvFxh7YmuxyHyWr4mTuUcgp43WlBwypJ318N6Xr3PY+hZPYJjz58ou3JLTgIu5CxxvlzPP3qN/mppW9dVPHE4RQ3ybGKonpeHBvJqLe9QKMw+eVPq8IwsRtQGhIYTQRYRbrTmTWh+nJNaj6nQ2J0qVCZYzkFJntqhotxGjj8MKtT34RWxGStZKA9aUW2uMr5dKDF1THuYmAveVxumAcAObsm3y6ryKDseF0LRUXteh4estWh7yjjFtuhmYtX7dSYayfeQ2LBYGC8M02g1Vt5U9ShnGCTTrqVyqTeN8dWiaR6SALZ7AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAES6q7nPMBVaAFXwWxCauRVa9BndgCeWx8ihXuE10PAx8fIOmrGPsYdHcX5yBVtJFqF6cg/dYaU7cja2Rmxp7EVwjt/JGoSgJ08V/0Ab36NFZO7MK4DGUxwqjjXXU476oEfInlNvAW4fEB+66X5B4NI4bHozdLVLLnpV8W1N/z3uOxWknoI+4+G4Cpn1/CqLW10R98jCX7MGYbxTLm5sARFwNhUsXrUa+7e8FN1E+UpKfp0PUzNMVJxfW3k6y5jJrmeJYgVaV8JvoVsoKD8zjN/XmExrhhrSN/giHr6cRpjgFKMkDhNYedkcHL9RwmXXxoWI6z5F5C/0Zj3jbJpUuWE=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC2jCCAcKgAwIBAgIQKSx3hQQhGrRC0NhtF+YWmDANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUzNzU1WhcNMjQwODE1MDUzNzU1WjApMScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBpZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCQjhfSS7MmszSlgTT/2cCywh2jogm4gEMBcYwLVeR9qnKinYuFuqzLMS2L2+3Yhx6XcjGviNXIxkSjUv8YwAXusBKgOILFm+bp5NJWCbTxp5maaAAua1TtDi/wfm2VRQ3hITdQemJi05xL5rO8M1rgELrljNM4vXfc/bFSvpLDiKFfyPYU2DleORP1tesWdNv0d8603gthsTzJk5/TV+c6TLWI38FGNJcQqernVQPrxsNDrpGneYb+oMFhCgMI04GnS48uSFmYgeTXmD5peeUeMWLTYyG3RCpqdThG9HUEwr6KKk25/kyTS4D+3N8YNdIo4DjMDeypbDI3MSEZ4t3AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKzmx1KLEoXd7D07WlKAndKYsK7zoyWf0l8UaEWvThtBPXrJErMC3nHMr8IdHPC32faPsKZO9QwFJylbck1SFuj+rNoC+BPOB97JLiD+qLUl7oaRG0VZIw7nOxEWEBiQdJn5padzUp8PyLJya/bLB74oLojf7W07rgR+QdT0rIX7k1CbW3KN+mpbGI1xigu2QgAiZHohubJdzHhlc6smXC+STrlm3UfSh9CGs1bxc8FruAVgyTcQGerlHu/O2w/hX6l9JWII7fQkHLuHN2eIVWW8q6Ye4cPYf1xqtmzIqF7Mi7yGQzFm5DQTvgVyxI0DlpGC9IYqZh5qjnU/5hnUce4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.statenssc.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.statenssc.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.statenssc.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.statenssc.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.statenssc.se/adfs/ls/" index="2"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Statens Servicecenter levererar tjänster inom löneadministration och ekonomiadministration.</md:ServiceName>
       <md:ServiceName xml:lang="en">Statens Servicecenter levererar tjänster inom löneadministration och ekonomiadministration.</md:ServiceName>
@@ -51,29 +51,29 @@
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md: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"/>
     </md:AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Statens Servicecenter</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.statenssc.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>William</GivenName>
-    <SurName>Åslund</SurName>
-    <EmailAddress>mailto:William.SteinAslund@statenssc.se</EmailAddress>
-    <TelephoneNumber>+46771451000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>it-andralinjen</GivenName>
-    <EmailAddress>mailto:it-andralinjen@statenssc.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>idplattform</GivenName>
-    <EmailAddress>mailto:idplattform@forsakringskassan.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>IT-sakerhet@statenssc.se</GivenName>
-    <EmailAddress>mailto:IT-sakerhet@statenssc.se</EmailAddress>
-  </ContactPerson>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Statens Servicecenter</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.statenssc.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>William</md:GivenName>
+    <md:SurName>Åslund</md:SurName>
+    <md:EmailAddress>mailto:William.SteinAslund@statenssc.se</md:EmailAddress>
+    <md:TelephoneNumber>+46771451000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>it-andralinjen</md:GivenName>
+    <md:EmailAddress>mailto:it-andralinjen@statenssc.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>idplattform</md:GivenName>
+    <md:EmailAddress>mailto:idplattform@forsakringskassan.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>IT-sakerhet@statenssc.se</md:GivenName>
+    <md:EmailAddress>mailto:IT-sakerhet@statenssc.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/id.test.easyvote.se-saml2.xml b/swamid-2.0/id.test.easyvote.se-saml2.xml
index 8d07d43a..e81b4476 100644
--- a/swamid-2.0/id.test.easyvote.se-saml2.xml
+++ b/swamid-2.0/id.test.easyvote.se-saml2.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Testenvironment for electronic elections</mdui:DisplayName>
@@ -19,38 +19,38 @@
         <mdui:Description xml:lang="sv">Lunds universitets testsystem för elektroniska val</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDSDCCAjCgAwIBAgIQbZ8VRUM4Tr9OtQ5lSgpTTzANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB4XDTE5MTAyMjEzMzMwM1oXDTIwMTAyMjEzNTMwM1owJDEiMCAGA1UEAwwZaWQudGVzdC5zYW1sMi5lYXN5dm90ZS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQQDX1eG5SuMAukTuSP+M+j4qdzzD5shhC8NL582Y7MK4b13pultm9ELqCyvxeBBi+uUjt2iOlk7eP0DqA5oM2UB2rfoOG4EdJXj2HZ+FAzRIZbaGRPe/4K8NK1fRYb/2GPR/Ow7jSgivHx3nCLZ3w28nkLhiN4K2LSV4wdS/C8X2TrI3QoftVuQZw1S97B3RgvLAAz7zNrud40VMnS0X/fAiG7El0eiEteMZm1LJrNOmSD/XgOUZlLKJV83+7jDBdP/Qwa1qgNy+5qPknehrzmropwyneOOARqGDGeuUOMr25tXZ2TJ5+toXR+9lh8SpP4VcgnbF2JVEf4NADwunUCAwEAAaN2MHQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAkBgNVHREEHTAbghlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB0GA1UdDgQWBBQQVAbrP50xPK+eruZsJylRqZz1LDANBgkqhkiG9w0BAQsFAAOCAQEAmOVnrNd38uUuk69QBtdDaP0u6afOFQfx3Jdi0g1MtE0aY/qW6i8/ycYi0e9wGCB+C+RnC3MCbFFvYlT8g2wsd4ludjQPYeFiGqta81ff19h/KfQ7hCRez/CcyIXo8tN6W15R3TCHcSljedDr0wI7xsbTpZLyFoVmNSuOtw2zF5+Uh0vjhj3akmWZgTTGeb/OTQHBydmevvoyGWDLnrv19tCJJ+T7qXuY/+beb+uEt/clsXnheNQjKTRTFVk8zNYJEPUr39bPUyeSqeywTCvSaZq2K8m1XG8kyBCfvtLyZFQr8+QILp3UvGy+xNCQPg1aTmNpfXV/xU7Sqe29FxIfiQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.test.easyvote.se/Saml2/Logout"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="true" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="false" index="1"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Lund University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Lunds universitet</Company>
-    <GivenName>Anna</GivenName>
-    <SurName>Åkesson</SurName>
-    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Lunds universitet</Company>
-    <GivenName>Eskil</GivenName>
-    <SurName>Swahn</SurName>
-    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Lunds universitet</Company>
-    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIQbZ8VRUM4Tr9OtQ5lSgpTTzANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB4XDTE5MTAyMjEzMzMwM1oXDTIwMTAyMjEzNTMwM1owJDEiMCAGA1UEAwwZaWQudGVzdC5zYW1sMi5lYXN5dm90ZS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQQDX1eG5SuMAukTuSP+M+j4qdzzD5shhC8NL582Y7MK4b13pultm9ELqCyvxeBBi+uUjt2iOlk7eP0DqA5oM2UB2rfoOG4EdJXj2HZ+FAzRIZbaGRPe/4K8NK1fRYb/2GPR/Ow7jSgivHx3nCLZ3w28nkLhiN4K2LSV4wdS/C8X2TrI3QoftVuQZw1S97B3RgvLAAz7zNrud40VMnS0X/fAiG7El0eiEteMZm1LJrNOmSD/XgOUZlLKJV83+7jDBdP/Qwa1qgNy+5qPknehrzmropwyneOOARqGDGeuUOMr25tXZ2TJ5+toXR+9lh8SpP4VcgnbF2JVEf4NADwunUCAwEAAaN2MHQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAkBgNVHREEHTAbghlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB0GA1UdDgQWBBQQVAbrP50xPK+eruZsJylRqZz1LDANBgkqhkiG9w0BAQsFAAOCAQEAmOVnrNd38uUuk69QBtdDaP0u6afOFQfx3Jdi0g1MtE0aY/qW6i8/ycYi0e9wGCB+C+RnC3MCbFFvYlT8g2wsd4ludjQPYeFiGqta81ff19h/KfQ7hCRez/CcyIXo8tN6W15R3TCHcSljedDr0wI7xsbTpZLyFoVmNSuOtw2zF5+Uh0vjhj3akmWZgTTGeb/OTQHBydmevvoyGWDLnrv19tCJJ+T7qXuY/+beb+uEt/clsXnheNQjKTRTFVk8zNYJEPUr39bPUyeSqeywTCvSaZq2K8m1XG8kyBCfvtLyZFQr8+QILp3UvGy+xNCQPg1aTmNpfXV/xU7Sqe29FxIfiQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.test.easyvote.se/Saml2/Logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="false" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Lunds universitet</md:Company>
+    <md:GivenName>Anna</md:GivenName>
+    <md:SurName>Åkesson</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Lunds universitet</md:Company>
+    <md:GivenName>Eskil</md:GivenName>
+    <md:SurName>Swahn</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Lunds universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp-shib.slu.se-idp.xml b/swamid-2.0/idp-shib.slu.se-idp.xml
index e819de24..6b8d2ad7 100644
--- a/swamid-2.0/idp-shib.slu.se-idp.xml
+++ b/swamid-2.0/idp-shib.slu.se-idp.xml
@@ -35,7 +35,6 @@
         <mdui:DomainHint>slu.se</mdui:DomainHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -134,15 +133,14 @@ ffEVzH+iKOe5hd6R
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SLO"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SLO"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shib.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shib.slu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://idp-shib.slu.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
     </md:Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
diff --git a/swamid-2.0/idp-shibtest.slu.se-idp.xml b/swamid-2.0/idp-shibtest.slu.se-idp.xml
index 69405b42..ebda2be2 100644
--- a/swamid-2.0/idp-shibtest.slu.se-idp.xml
+++ b/swamid-2.0/idp-shibtest.slu.se-idp.xml
@@ -11,8 +11,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-shibtest.slu.se/idp">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-shibtest.slu.se/idp">
+    <md:Extensions>
       <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SLU Shibboleth Idp Test</mdui:DisplayName>
@@ -26,9 +26,8 @@
         <mdui:Logo xml:lang="sv" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -58,8 +57,8 @@ lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -89,8 +88,8 @@ fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -120,22 +119,21 @@ osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" req-attr:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" req-attr:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shibtest.slu.se/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shibtest.slu.se/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-    </Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -165,8 +163,8 @@ lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -196,8 +194,8 @@ fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -227,29 +225,29 @@ osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationName>
-    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.slu.se/en/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">https://www.slu.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-    <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml b/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
index b7103b1c..1729a1af 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:IDPSSODescriptor xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
-    <saml:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
+    <md:Extensions>
       <shibmd:Scope regexp="false">test.sunet.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Sunet IdPaaS Test</mdui:DisplayName>
@@ -19,11 +19,11 @@
       <mdui:DiscoHints>
         <mdui:DomainHint>test.sunet.se</mdui:DomainHint>
       </mdui:DiscoHints>
-    </saml:Extensions>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEOjCCAqKgAwIBAgIJANaoiJzHBBqYMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
 BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDgxMTQ5MzdaFw0yOTAy
 MDUxMTQ5MzdaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
@@ -47,9 +47,9 @@ kq/QJf//0bnCPsUVO0yGupFzwB3qHbaK7BG3JtWW1BBTKh4OvI7dRV6ivgmmWEg0
 BNC6JBhMIppOew+KNLzsPNzB5242LBdZd6v0IIR/swP8oi5qFTAe2jwpxAi8QxwE
 v1H4Us0UOyaQ0lqJz6Qz+JxzbZO90KN6TK1YLfs79zhoK1jJt73EOC8iK48dVgY8
 ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/redirect"/>
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml b/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml
index 7aeb1084..46251b23 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml
@@ -10,16 +10,16 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Sunets COmanage IDP (test)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Sunet's COmanage IDP (test)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">COmanage IDP (test) hos Sunet</mdui:Description>
         <mdui:Description xml:lang="en">COmanage IDP (test) at Sunet</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -49,20 +49,20 @@ ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SUNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Technical</GivenName>
-    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
index 0f923038..52f25b93 100644
--- a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.nordu.net/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.nordu.net/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">nordu.net</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">NORDUnet Test IdP</mdui:DisplayName>
@@ -16,8 +16,8 @@
       <mdui:DiscoHints>
         <mdui:DomainHint>nordu.net</mdui:DomainHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -43,21 +43,21 @@ X627IsSkKg==
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.nordu.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.nordu.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.nordu.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.nordu.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.nordu.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.nordu.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">nordu.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -83,20 +83,20 @@ X627IsSkKg==
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">NORDUnetTEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">NORDUnet Test IdP</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NORDUnet Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>NORDUnet NOC</Company>
-    <EmailAddress>mailto:noc@nordu.net</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnetTEST</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">NORDUnet Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
index cb3c2e5b..5b9ae13b 100644
--- a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
@@ -5,32 +5,32 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC4jCCAcqgAwIBAgIQek/EaOs9V7VFR7XG3cPV/TANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLnQfl7WTniCN9Y4WD6FGtQTtfrU7cto9w/1p3lPZynmiYZ2XoVLCIFOjshhnTtUWSdj5ajAXEWkTE0wuLJKIffDblJbUcdxi1V9uOkHoytCRV7sN48hGm5ayu2aT6j6272R0P7iLhaoU5QR/AWsyo4A/UDRirGa/m0pJyyfhSuHqFmkl9f5voLZLvweHrgWj+ie1xkACeeiKnykKqLgBf4LI5z+PMlhMGbLTGsmH5+ljwUmBqiXh2FMG62//gOBDs7wq1iZIm1DV/4b7yKJrTJgStrgo7XVZfj9+BMbc3NRdYgL/WG6E4t6WP2rhtflDY9/xNm1l5nIW7Wd3+S760CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABc10A6vq9oVHSxmqh7+hwpT8l6eRZhiBDmNAGUovbLnXeytV02vZc6IXNEI72Qzhh6g0FiGSucxRTrUyMX9FtjR/vBwk16KSLQn0FNNBxqV8Wet9mE5R+1fPGWzulp8YQtz5J31xchGoMieJ7M+TLV1Od0iQSqa3/9pfVV35ui4kiPXSyFhUtvRAn+fvSi8RYg6DVB4IRUskLOEMlYRq1SH8JfaiCwdbd5IzDA7Pe60qxrPVOyBJRylfR770ubyJAxhIvfU2m2nKOw2jALD98jDjQ7/1Nli9kA7vdf2NsMUgR76qGczGepjF2l4MIpV22RwMVbfnVsaC0mTpHMdQkg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC3DCCAcSgAwIBAgIQdLObATCTf61N9d9qj8ZV0zANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWUL0Drry/FB46wntV1iIOsBg6QqXrvDlCGaJ/O1JhJ2/ZeqACcCKPZySJSQ+0x5R3V9rbbI4an1JM20Bktjf0xmfT2+80QgGjvNi2W5drem+t7SOAvCBa8RvkYkY2lX/wee6bInkAlsAtQZ9o9ffgYVxlOUW+USR+7XT6F9wtTVrZSX2QK4whj9JWdyA/sQLgjeWU8WFN506KZERm3ua1wpV5EoCOnShIamGhfpgaRVNPI9pcyw0gwXeMdDfPYhfBFni1Tn9tLdsYj878P/3irKwkcTtC3VgYnKsI9U6XJzG5w1wfzTJEnSp9HVhF7UaFcEYTgb3sXunGKwz49ABsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQf4xSVepvO2OtF1AokPidv0o1RHYsmJjREfn/bJVV0SQKaYCUx75rPaPUEQTqY3vLdongoJmRaM2hudr5fF+iGRsvIAPoZQcESOZ55k9ff2Ix4yj3CrH93RCbiWDlx80xgjIP5NrsZsrq9YSV6IQCml77qAwYdg7LqeLie1rmgh59PnrIxKO9JoDp8ZYJV1fAaaEpnuqbmUlL51RFNHsyujvc3i991yHCifeDVseOZchZAafmnHHphfsUdlInrohcy4p9nFC8/DdUmipViTAvB6HVvU18lw9dUBU8D4m+RitudnecZdxABWfb4l63j+PhPHDmHS1AuWF0Shs5yrXBQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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://idp-test.suni.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-test.suni.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp-test.suni.se/adfs/services/trust">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC4jCCAcqgAwIBAgIQek/EaOs9V7VFR7XG3cPV/TANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLnQfl7WTniCN9Y4WD6FGtQTtfrU7cto9w/1p3lPZynmiYZ2XoVLCIFOjshhnTtUWSdj5ajAXEWkTE0wuLJKIffDblJbUcdxi1V9uOkHoytCRV7sN48hGm5ayu2aT6j6272R0P7iLhaoU5QR/AWsyo4A/UDRirGa/m0pJyyfhSuHqFmkl9f5voLZLvweHrgWj+ie1xkACeeiKnykKqLgBf4LI5z+PMlhMGbLTGsmH5+ljwUmBqiXh2FMG62//gOBDs7wq1iZIm1DV/4b7yKJrTJgStrgo7XVZfj9+BMbc3NRdYgL/WG6E4t6WP2rhtflDY9/xNm1l5nIW7Wd3+S760CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABc10A6vq9oVHSxmqh7+hwpT8l6eRZhiBDmNAGUovbLnXeytV02vZc6IXNEI72Qzhh6g0FiGSucxRTrUyMX9FtjR/vBwk16KSLQn0FNNBxqV8Wet9mE5R+1fPGWzulp8YQtz5J31xchGoMieJ7M+TLV1Od0iQSqa3/9pfVV35ui4kiPXSyFhUtvRAn+fvSi8RYg6DVB4IRUskLOEMlYRq1SH8JfaiCwdbd5IzDA7Pe60qxrPVOyBJRylfR770ubyJAxhIvfU2m2nKOw2jALD98jDjQ7/1Nli9kA7vdf2NsMUgR76qGczGepjF2l4MIpV22RwMVbfnVsaC0mTpHMdQkg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQdLObATCTf61N9d9qj8ZV0zANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWUL0Drry/FB46wntV1iIOsBg6QqXrvDlCGaJ/O1JhJ2/ZeqACcCKPZySJSQ+0x5R3V9rbbI4an1JM20Bktjf0xmfT2+80QgGjvNi2W5drem+t7SOAvCBa8RvkYkY2lX/wee6bInkAlsAtQZ9o9ffgYVxlOUW+USR+7XT6F9wtTVrZSX2QK4whj9JWdyA/sQLgjeWU8WFN506KZERm3ua1wpV5EoCOnShIamGhfpgaRVNPI9pcyw0gwXeMdDfPYhfBFni1Tn9tLdsYj878P/3irKwkcTtC3VgYnKsI9U6XJzG5w1wfzTJEnSp9HVhF7UaFcEYTgb3sXunGKwz49ABsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQf4xSVepvO2OtF1AokPidv0o1RHYsmJjREfn/bJVV0SQKaYCUx75rPaPUEQTqY3vLdongoJmRaM2hudr5fF+iGRsvIAPoZQcESOZ55k9ff2Ix4yj3CrH93RCbiWDlx80xgjIP5NrsZsrq9YSV6IQCml77qAwYdg7LqeLie1rmgh59PnrIxKO9JoDp8ZYJV1fAaaEpnuqbmUlL51RFNHsyujvc3i991yHCifeDVseOZchZAafmnHHphfsUdlInrohcy4p9nFC8/DdUmipViTAvB6HVvU18lw9dUBU8D4m+RitudnecZdxABWfb4l63j+PhPHDmHS1AuWF0Shs5yrXBQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-test.suni.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp-test.suni.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Södertörns högskola - test</mdui:DisplayName>
@@ -42,38 +42,38 @@
         <mdui:Logo xml:lang="sv" height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC4jCCAcqgAwIBAgIQek/EaOs9V7VFR7XG3cPV/TANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLnQfl7WTniCN9Y4WD6FGtQTtfrU7cto9w/1p3lPZynmiYZ2XoVLCIFOjshhnTtUWSdj5ajAXEWkTE0wuLJKIffDblJbUcdxi1V9uOkHoytCRV7sN48hGm5ayu2aT6j6272R0P7iLhaoU5QR/AWsyo4A/UDRirGa/m0pJyyfhSuHqFmkl9f5voLZLvweHrgWj+ie1xkACeeiKnykKqLgBf4LI5z+PMlhMGbLTGsmH5+ljwUmBqiXh2FMG62//gOBDs7wq1iZIm1DV/4b7yKJrTJgStrgo7XVZfj9+BMbc3NRdYgL/WG6E4t6WP2rhtflDY9/xNm1l5nIW7Wd3+S760CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABc10A6vq9oVHSxmqh7+hwpT8l6eRZhiBDmNAGUovbLnXeytV02vZc6IXNEI72Qzhh6g0FiGSucxRTrUyMX9FtjR/vBwk16KSLQn0FNNBxqV8Wet9mE5R+1fPGWzulp8YQtz5J31xchGoMieJ7M+TLV1Od0iQSqa3/9pfVV35ui4kiPXSyFhUtvRAn+fvSi8RYg6DVB4IRUskLOEMlYRq1SH8JfaiCwdbd5IzDA7Pe60qxrPVOyBJRylfR770ubyJAxhIvfU2m2nKOw2jALD98jDjQ7/1Nli9kA7vdf2NsMUgR76qGczGepjF2l4MIpV22RwMVbfnVsaC0mTpHMdQkg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC3DCCAcSgAwIBAgIQdLObATCTf61N9d9qj8ZV0zANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWUL0Drry/FB46wntV1iIOsBg6QqXrvDlCGaJ/O1JhJ2/ZeqACcCKPZySJSQ+0x5R3V9rbbI4an1JM20Bktjf0xmfT2+80QgGjvNi2W5drem+t7SOAvCBa8RvkYkY2lX/wee6bInkAlsAtQZ9o9ffgYVxlOUW+USR+7XT6F9wtTVrZSX2QK4whj9JWdyA/sQLgjeWU8WFN506KZERm3ua1wpV5EoCOnShIamGhfpgaRVNPI9pcyw0gwXeMdDfPYhfBFni1Tn9tLdsYj878P/3irKwkcTtC3VgYnKsI9U6XJzG5w1wfzTJEnSp9HVhF7UaFcEYTgb3sXunGKwz49ABsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQf4xSVepvO2OtF1AokPidv0o1RHYsmJjREfn/bJVV0SQKaYCUx75rPaPUEQTqY3vLdongoJmRaM2hudr5fF+iGRsvIAPoZQcESOZ55k9ff2Ix4yj3CrH93RCbiWDlx80xgjIP5NrsZsrq9YSV6IQCml77qAwYdg7LqeLie1rmgh59PnrIxKO9JoDp8ZYJV1fAaaEpnuqbmUlL51RFNHsyujvc3i991yHCifeDVseOZchZAafmnHHphfsUdlInrohcy4p9nFC8/DdUmipViTAvB6HVvU18lw9dUBU8D4m+RitudnecZdxABWfb4l63j+PhPHDmHS1AuWF0Shs5yrXBQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.suni.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Södertörns högskola - test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.sh.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Tomas</GivenName>
-    <SurName>Legat</SurName>
-    <EmailAddress>mailto:tomas.legat@sh.se</EmailAddress>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC4jCCAcqgAwIBAgIQek/EaOs9V7VFR7XG3cPV/TANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLnQfl7WTniCN9Y4WD6FGtQTtfrU7cto9w/1p3lPZynmiYZ2XoVLCIFOjshhnTtUWSdj5ajAXEWkTE0wuLJKIffDblJbUcdxi1V9uOkHoytCRV7sN48hGm5ayu2aT6j6272R0P7iLhaoU5QR/AWsyo4A/UDRirGa/m0pJyyfhSuHqFmkl9f5voLZLvweHrgWj+ie1xkACeeiKnykKqLgBf4LI5z+PMlhMGbLTGsmH5+ljwUmBqiXh2FMG62//gOBDs7wq1iZIm1DV/4b7yKJrTJgStrgo7XVZfj9+BMbc3NRdYgL/WG6E4t6WP2rhtflDY9/xNm1l5nIW7Wd3+S760CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABc10A6vq9oVHSxmqh7+hwpT8l6eRZhiBDmNAGUovbLnXeytV02vZc6IXNEI72Qzhh6g0FiGSucxRTrUyMX9FtjR/vBwk16KSLQn0FNNBxqV8Wet9mE5R+1fPGWzulp8YQtz5J31xchGoMieJ7M+TLV1Od0iQSqa3/9pfVV35ui4kiPXSyFhUtvRAn+fvSi8RYg6DVB4IRUskLOEMlYRq1SH8JfaiCwdbd5IzDA7Pe60qxrPVOyBJRylfR770ubyJAxhIvfU2m2nKOw2jALD98jDjQ7/1Nli9kA7vdf2NsMUgR76qGczGepjF2l4MIpV22RwMVbfnVsaC0mTpHMdQkg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQdLObATCTf61N9d9qj8ZV0zANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWUL0Drry/FB46wntV1iIOsBg6QqXrvDlCGaJ/O1JhJ2/ZeqACcCKPZySJSQ+0x5R3V9rbbI4an1JM20Bktjf0xmfT2+80QgGjvNi2W5drem+t7SOAvCBa8RvkYkY2lX/wee6bInkAlsAtQZ9o9ffgYVxlOUW+USR+7XT6F9wtTVrZSX2QK4whj9JWdyA/sQLgjeWU8WFN506KZERm3ua1wpV5EoCOnShIamGhfpgaRVNPI9pcyw0gwXeMdDfPYhfBFni1Tn9tLdsYj878P/3irKwkcTtC3VgYnKsI9U6XJzG5w1wfzTJEnSp9HVhF7UaFcEYTgb3sXunGKwz49ABsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQf4xSVepvO2OtF1AokPidv0o1RHYsmJjREfn/bJVV0SQKaYCUx75rPaPUEQTqY3vLdongoJmRaM2hudr5fF+iGRsvIAPoZQcESOZ55k9ff2Ix4yj3CrH93RCbiWDlx80xgjIP5NrsZsrq9YSV6IQCml77qAwYdg7LqeLie1rmgh59PnrIxKO9JoDp8ZYJV1fAaaEpnuqbmUlL51RFNHsyujvc3i991yHCifeDVseOZchZAafmnHHphfsUdlInrohcy4p9nFC8/DdUmipViTAvB6HVvU18lw9dUBU8D4m+RitudnecZdxABWfb4l63j+PhPHDmHS1AuWF0Shs5yrXBQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.suni.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola - test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.sh.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Legat</md:SurName>
+    <md:EmailAddress>mailto:tomas.legat@sh.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml b/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
index a9c386e4..6ad420db 100644
--- a/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
+++ b/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:IDPSSODescriptor xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
-    <saml:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.comanage.sunet.se/Saml2IDP/sp/SUNET-TEST">
+    <md:Extensions>
       <shibmd:Scope regexp="false">test.sunet.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SUNET test IdP old</mdui:DisplayName>
@@ -19,11 +19,11 @@
       <mdui:DiscoHints>
         <mdui:DomainHint>test.sunet.se</mdui:DomainHint>
       </mdui:DiscoHints>
-    </saml:Extensions>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIENDCCApygAwIBAgIJAORi/Km/xEp8MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIENDCCApygAwIBAgIJAORi/Km/xEp8MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
 BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDcxMDI2MDlaFw0yOTAy
 MDQxMDI2MDlaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
 DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMXTvH+aNhT7qyQvQUTB89z9vHBH
@@ -46,9 +46,9 @@ tGiKOy+tXB3cWkyyrPAa+3S2W4uC9XP4PXO2aHAFL3palb2Ej9FhOZ7bqC4vRE5X
 kGm/s/4IpZ/FCINKrvbroZzQlslBRvswkM+bGMFR7mFIGiJXhpBNRiXjYG2TaPMy
 oPilwb8jyQfSc/2nc5hkeMxd1RgXXsb1cz86mq+z1/yeQQE+QtrIrRX18Q5IcHRZ
 HJbyRQeO5J/RKe2busGducxQo6/KccmF
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/redirect"/>
diff --git a/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml b/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml
index e5bfb49d..28ada593 100644
--- a/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml
+++ b/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml
@@ -11,16 +11,16 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Sunets COmanage IDP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Sunet's COmanage IDP</mdui:DisplayName>
         <mdui:Description xml:lang="sv">COmanage IDP hos Sunet</mdui:Description>
         <mdui:Description xml:lang="en">COmanage IDP at Sunet</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -50,20 +50,20 @@ HJbyRQeO5J/RKe2busGducxQo6/KccmF
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SUNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Technical</GivenName>
-    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
index 4d0e09c4..6197c79f 100644
--- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
+++ b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
@@ -4,29 +4,29 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-17T16:03:07Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al3</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:IDPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://dev.eduid.se/errors?code=ERRORURL_CODE&amp;ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX">
-    <ns0:Extensions>
-      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">eduid.se</ns1:Scope>
-      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">dev.eduid.se</ns1:Scope>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://dev.eduid.se/errors?code=ERRORURL_CODE&amp;ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">eduid.se</shibmd:Scope>
+      <shibmd:Scope regexp="false">dev.eduid.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
 RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
 MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
 ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
@@ -45,14 +45,14 @@ EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
 g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
 xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
 hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
 RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
 MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
 ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
@@ -71,31 +71,31 @@ EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
 g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
 xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
 hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dev.eduid.se/slo/soap"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/slo/post"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/slo/redirect"/>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/sso/redirect"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dev.eduid.se/sso/art"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">eduID DEV TEST</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID DEV TEST</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>eduID</ns0:GivenName>
-    <ns0:SurName>developers</ns0:SurName>
-    <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback+swamidtesting@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dev.eduid.se/slo/soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/slo/post"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/slo/redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dev.eduid.se/sso/redirect"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/sso/post"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dev.eduid.se/sso/art"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eduID DEV TEST</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduID DEV TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduid.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduID</md:GivenName>
+    <md:SurName>developers</md:SurName>
+    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:feedback+swamidtesting@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
index 1ec7cbf1..81f6c803 100644
--- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
@@ -5,18 +5,18 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hh.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hh.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
@@ -35,8 +35,8 @@
         <mdui:IPHint>194.47.0.0/20</mdui:IPHint>
         <mdui:GeolocationHint>geo:56.6647,12.8779</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -60,8 +60,8 @@ Wj/p8G0pPieiOJ6Mgh4niOFi9oo=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -85,8 +85,8 @@ RgAusEoMo1w4CrwOMBfFqoCZ6g==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -110,20 +110,20 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hh.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hh.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -147,8 +147,8 @@ Wj/p8G0pPieiOJ6Mgh4niOFi9oo=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -172,8 +172,8 @@ RgAusEoMo1w4CrwOMBfFqoCZ6g==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -197,31 +197,31 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">HH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Halmstad University</Company>
-    <SurName>Magnus Morén</SurName>
-    <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
-    <TelephoneNumber>+46 35 167383</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Halmstad University</Company>
-    <SurName>Magnus Morén</SurName>
-    <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
-    <TelephoneNumber>+46 35 167383</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Halmstad University</Company>
-    <SurName>Helpdesk Högskloan i Halmstad</SurName>
-    <EmailAddress>mailto:helpdesk@hh.se</EmailAddress>
-    <TelephoneNumber>+35 167800</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Halmstad University</md:Company>
+    <md:SurName>Magnus Morén</md:SurName>
+    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Halmstad University</md:Company>
+    <md:SurName>Magnus Morén</md:SurName>
+    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Halmstad University</md:Company>
+    <md:SurName>Helpdesk Högskloan i Halmstad</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
+    <md:TelephoneNumber>+35 167800</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index 127728a1..b4fec2f9 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
@@ -4,19 +4,19 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-12T13:50:46Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.his.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.his.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">his.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
@@ -40,9 +40,8 @@
         <mdui:GeolocationHint>geo:58.39,13.85</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:58.39412,13.85542</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel-->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -77,8 +76,8 @@ zd/8UxmFiKo=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -113,8 +112,8 @@ LhX8iNAQPA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -149,36 +148,36 @@ zGqLyGPg/8g=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" req-attr:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" req-attr:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" req-attr:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">HIS</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Skövde</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.his.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Skövde</Company>
-    <SurName>HiS Netadmin</SurName>
-    <EmailAddress>mailto:netadmin@his.se</EmailAddress>
-    <TelephoneNumber>+46 500 448800</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Skövde</Company>
-    <SurName>HiS Netadmin</SurName>
-    <EmailAddress>mailto:netadmin@his.se</EmailAddress>
-    <TelephoneNumber>+46 500 448800</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Skövde</Company>
-    <SurName>IT Helpdesk Högskolan i Skövde</SurName>
-    <EmailAddress>mailto:helpdesk@his.se</EmailAddress>
-    <TelephoneNumber>+46 500 448800</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns7:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HIS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Skövde</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.his.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Skövde</md:Company>
+    <md:SurName>HiS Netadmin</md:SurName>
+    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Skövde</md:Company>
+    <md:SurName>HiS Netadmin</md:SurName>
+    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Skövde</md:Company>
+    <md:SurName>IT Helpdesk Högskolan i Skövde</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@his.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hj.se-idp-shibboleth.xml b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
index 4fc6f9c0..60d8e0e1 100644
--- a/swamid-2.0/idp.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
@@ -117,11 +117,6 @@ I91KnWp+FpSd3F3W0MlM1+MiKQ==
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hj.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hj.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hj.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hj.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hj.se/idp/profile/Shibboleth/SSO"/>
@@ -208,8 +203,6 @@ I91KnWp+FpSd3F3W0MlM1+MiKQ==
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hj.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">HJ</md:OrganizationName>
diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index dd6d9d27..cb995a66 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -5,14 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.kmh.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.kmh.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</mdui:DisplayName>
@@ -31,8 +31,8 @@
         <mdui:IPHint>193.10.62.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
@@ -54,25 +54,25 @@ cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
 SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kmh.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kmh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kmh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kmh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
@@ -94,33 +94,33 @@ cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
 SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">KMH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Music in Stockholm</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kmh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Royal College of Music</Company>
-    <SurName>KMH IT-avdelningen</SurName>
-    <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Royal College of Music</Company>
-    <SurName>KMH IT-avdelningen</SurName>
-    <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Royal College of Music</Company>
-    <SurName>KMH IT HelpDesk</SurName>
-    <EmailAddress>mailto:helpdesk@kmh.se</EmailAddress>
-    <TelephoneNumber>+46 8 161939</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KMH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Music in Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kmh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Royal College of Music</md:Company>
+    <md:SurName>KMH IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Royal College of Music</md:Company>
+    <md:SurName>KMH IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Royal College of Music</md:Company>
+    <md:SurName>KMH IT HelpDesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@kmh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 161939</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index 9761ef95..436f71e9 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -5,14 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.kva.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.kva.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">kva.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Kungliga Vetenskapsakademien</mdui:DisplayName>
@@ -27,8 +27,8 @@
         <mdui:IPHint>130.242.20.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.36542,18.05204</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -54,22 +54,22 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kva.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kva.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kva.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kva.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kva.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kva.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kva.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kva.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">kva.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -95,32 +95,32 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">KVA</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kva.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>The Royal Swedish Academy of Sciences</Company>
-    <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
-    <TelephoneNumber>+46 70 6739792</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>The Royal Swedish Academy of Sciences</Company>
-    <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
-    <TelephoneNumber>+46 70 6739792</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>The Royal Swedish Academy of Sciences</Company>
-    <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
-    <TelephoneNumber>+46 70 6739792</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KVA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kva.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
+    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
+    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
+    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
index dc1a6dcc..404b5e11 100644
--- a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
@@ -4,19 +4,19 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-12-19T13:30:34Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://www.ltu.se/ltu/it-support/loginerror-1.207338">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://www.ltu.se/ltu/it-support/loginerror-1.207338">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
@@ -32,8 +32,8 @@
         <mdui:DomainHint>ltu.se</mdui:DomainHint>
         <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -57,8 +57,8 @@ Imrso4dObDk/xFdJSbWgmKWEnvUc2+o=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -82,8 +82,8 @@ X4dei9FUiIpNKgYziKf/tzbvJQqiV18l
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -107,20 +107,20 @@ ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ltu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ltu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -144,8 +144,8 @@ Imrso4dObDk/xFdJSbWgmKWEnvUc2+o=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -169,8 +169,8 @@ X4dei9FUiIpNKgYziKf/tzbvJQqiV18l
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -194,35 +194,35 @@ ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">LTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Incident Response Team</GivenName>
-    <EmailAddress>mailto:abuse@ltu.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LTU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lulea University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ltu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Lulea University of Technology</md:Company>
+    <md:SurName>LTU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Lulea University of Technology</md:Company>
+    <md:SurName>LTU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Lulea University of Technology</md:Company>
+    <md:SurName>LTU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@ltu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.test.sunet.se-idp.xml b/swamid-2.0/idp.test.sunet.se-idp.xml
index 8c4d43b0..2c9e3264 100644
--- a/swamid-2.0/idp.test.sunet.se-idp.xml
+++ b/swamid-2.0/idp.test.sunet.se-idp.xml
@@ -5,28 +5,28 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
   </md:Extensions>
-  <ns0:IDPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.test.sunet.se/idp">
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.test.sunet.se/idp">
     <md:Extensions>
       <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -41,10 +41,10 @@
         <mdui:DomainHint>sunet.se</mdui:DomainHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFFTCCAv2gAwIBAgIUYEql9KeORzO2MWunOhj+TpEjff8wDQYJKoZIhvcNAQEL
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUYEql9KeORzO2MWunOhj+TpEjff8wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMB4XDTIwMDUwNTA5MDQwOVoX
 DTMwMDUwMzA5MDQwOVowGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMIICIjAN
 BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuO4LF9D+pTsI21yr4j91KEHa8P/N
@@ -72,25 +72,25 @@ dlp8PDkRRctKbUu4ojK9mvYr7XfXY3UMVhLHorFfUEv7TEzN7OnAQC9AxFmAoQj0
 z22R0TQfg2nJKac4/rZ3Ri6IJtD9maIHeL3XikGrVe/9el8wXCVVOXsb6e+aJltj
 LVuQ6hWxdLht5ODuYILdfwPWFpdhTalVF4JgxqgpwMmAv7f4UHu6ukFQcq1jX+eI
 w1/klZ0omp5S
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.sunet.se/Saml2SP/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.sunet.se/Saml2SP/sso/redirect"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">SUNET Staff Login</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">SUNET - Test</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.sunet.se/Saml2SP/sso/post"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.sunet.se/Saml2SP/sso/redirect"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET Staff Login</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.uhr.se-idp-shibboleth.xml b/swamid-2.0/idp.uhr.se-idp-shibboleth.xml
index d8b8d0f7..6e7b103f 100644
--- a/swamid-2.0/idp.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.uhr.se-idp-shibboleth.xml
@@ -5,21 +5,21 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.uhr.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.uhr.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">UHR's IDP</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identityprovider for UHR</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -43,8 +43,8 @@ jh6Yq3qCCn2Yb+cFUDJT72VDJ7NoDRg=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -68,8 +68,8 @@ jcs6eH7JlXc3P5b44189qTfCgUMntVg=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -93,25 +93,20 @@ slCO9tT9JJLe1hpBFObZDTDY6/rOkuc=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhr.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhr.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhr.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhr.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhr.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhr.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -135,8 +130,8 @@ jh6Yq3qCCn2Yb+cFUDJT72VDJ7NoDRg=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -160,8 +155,8 @@ jcs6eH7JlXc3P5b44189qTfCgUMntVg=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -185,9 +180,7 @@ slCO9tT9JJLe1hpBFObZDTDY6/rOkuc=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
index 364cdeb9..a7742ca4 100644
--- a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
@@ -4,19 +4,19 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-27T14:19:16Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp01.gih.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp01.gih.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
+    <md:Extensions>
       <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</mdui:DisplayName>
@@ -34,8 +34,8 @@
         <mdui:DomainHint>gih.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -59,8 +59,8 @@ CBrxpLKO37g0kNPV5ahlI/rw0qrHS8ht8GVXQ85gHyWWPHQehf57HAO/pGCAJd7K
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -84,8 +84,8 @@ ubfqJD+WHSiZclOpNiBpr6d+1L5zGC6xD/PT9/eWpyk=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -109,20 +109,20 @@ MEsSqGHVIFzyCxPzfTl7HEhnSzXaKE07ShUemr6eig==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.gih.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.gih.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.gih.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.gih.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.gih.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.gih.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.gih.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.gih.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -146,8 +146,8 @@ CBrxpLKO37g0kNPV5ahlI/rw0qrHS8ht8GVXQ85gHyWWPHQehf57HAO/pGCAJd7K
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -171,8 +171,8 @@ ubfqJD+WHSiZclOpNiBpr6d+1L5zGC6xD/PT9/eWpyk=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -196,31 +196,31 @@ MEsSqGHVIFzyCxPzfTl7HEhnSzXaKE07ShUemr6eig==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">The Swedish School of sport and health sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>The Swedish School of Sport and Health Sciences</Company>
-    <SurName>CIO</SurName>
-    <EmailAddress>mailto:cio@gih.se</EmailAddress>
-    <TelephoneNumber>+46 8 12053700</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>The Swedish School of Sport and Health Sciences</Company>
-    <SurName>ITOPS</SurName>
-    <EmailAddress>mailto:itops@gih.se</EmailAddress>
-    <TelephoneNumber>+46 8 12053700</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>The Swedish School of Sport and Health Sciences</Company>
-    <SurName>IT Support</SurName>
-    <EmailAddress>mailto:itsupport@gih.se</EmailAddress>
-    <TelephoneNumber>+46 8 12053700</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gih.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>CIO</md:SurName>
+    <md:EmailAddress>mailto:cio@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053700</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>ITOPS</md:SurName>
+    <md:EmailAddress>mailto:itops@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053700</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>IT Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053700</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
index 8be2fe31..285c5975 100644
--- a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp02.gih.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp02.gih.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan, GIH - Test</mdui:DisplayName>
@@ -24,8 +24,8 @@
         <mdui:DomainHint>gih.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -49,8 +49,8 @@ U+hy+KSevibyVy5OBDk6lia+Yp9JAMYJ9eXkcaI1mg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -74,8 +74,8 @@ HrR00emNkHk9fs7zq95jHw4hSBCKWKhvoL62Xe4m/EE=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -99,20 +99,20 @@ hfPauxBtehyqdj0u5Kh1alBnJrNgsNU1ldLSDXt8fxU=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.gih.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.gih.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp02.gih.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp02.gih.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.gih.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.gih.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp02.gih.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp02.gih.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -136,8 +136,8 @@ U+hy+KSevibyVy5OBDk6lia+Yp9JAMYJ9eXkcaI1mg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -161,8 +161,8 @@ HrR00emNkHk9fs7zq95jHw4hSBCKWKhvoL62Xe4m/EE=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -186,31 +186,31 @@ hfPauxBtehyqdj0u5Kh1alBnJrNgsNU1ldLSDXt8fxU=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">The Swedish School of Sport and Health Sciences (Test)</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan (Test)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gih.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>The Swedish School of Sport and Health Sciences</Company>
-    <SurName>Fredrik Nilsson</SurName>
-    <EmailAddress>mailto:fredrik.nilsson@gih.se</EmailAddress>
-    <TelephoneNumber>+46 8 12053734</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>The Swedish School of Sport and Health Sciences</Company>
-    <SurName>Michael Thunell</SurName>
-    <EmailAddress>mailto:michael.thunell@gih.se</EmailAddress>
-    <TelephoneNumber>+46 8 12053807</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>The Swedish School of Sport and Health Sciences</Company>
-    <SurName>Charlie Skog</SurName>
-    <EmailAddress>mailto:charlie.skog@gih.se</EmailAddress>
-    <TelephoneNumber>+46 8 12053792</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish School of Sport and Health Sciences (Test)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan (Test)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gih.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>Fredrik Nilsson</md:SurName>
+    <md:EmailAddress>mailto:fredrik.nilsson@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053734</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>Michael Thunell</md:SurName>
+    <md:EmailAddress>mailto:michael.thunell@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053807</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>Charlie Skog</md:SurName>
+    <md:EmailAddress>mailto:charlie.skog@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053792</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml
index ae884ba5..3cd105ce 100644
--- a/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml
@@ -123,11 +123,6 @@ ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.it.gu.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.it.gu.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.it.gu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.it.gu.se/idp/profile/Shibboleth/SSO"/>
diff --git a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
index aae62362..b3d11e05 100644
--- a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
@@ -115,11 +115,6 @@ R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kkh.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kkh.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kkh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.kkh.se/idp/profile/Shibboleth/SSO"/>
@@ -206,8 +201,6 @@ R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">KKH</md:OrganizationName>
diff --git a/swamid-2.0/idpproxy.dev.eduid.se-idp.xml b/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
index 8f04d745..a12fb40d 100644
--- a/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
+++ b/swamid-2.0/idpproxy.dev.eduid.se-idp.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpproxy.dev.eduid.se/idp">
   <md:Extensions>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-20T21:04:54Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:IDPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idpproxy.dev.eduid.se/idp">
-    <ns0:Extensions>
-      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">dev.eduid.se</ns1:Scope>
-      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">test.eduid.se</ns1:Scope>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idpproxy.dev.eduid.se/idp">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">dev.eduid.se</shibmd:Scope>
+      <shibmd:Scope regexp="false">test.eduid.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">eduID Proxy IdP Sverige</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">eduID Proxy IdP Sweden</mdui:DisplayName>
@@ -39,40 +39,40 @@
         <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
         <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
       </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns1:X509Certificate xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">MIIFFTCCAv2gAwIBAgIUHwEGLhFEa8Ow6G6Xpz4I572785cwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTIwMDMxODE1MDQwOFoXDTMwMDMxNjE1MDQwOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouQV4lrmp+k+7a8Q/kfovbIF9me1Ls4LMZ3PyqL5JYvAVd+KcMQG4GGEwQ7HHsSzQnhsypyQsZFQeWqtAu5H81KZL1i7DHqD2n2/DmYqfuV9l2f9FlQ1e3VTLtOWX2PlkmiN38VNTWWFAYDNeJg46EJHn/5kFIuBycVcR0wveaXDs8dtjOTSqSawfnwiGeUCv508OK3OD5L9U1snKp7trT5Q1EPLojnihfpqkol0UwecjSBPhd5Lpocm/VGKLfOqnMWLF71PJvu0QN9V4KMZ17rmD8IQlxo8TQQpcYKov55E7AwX9e0H/q9PjjmMVATAfCBVdUCHX93+VvUuQzEBGdT97F0ldbnZsrsp+ec4niKaeIqRYu77B0oWwNQfgJ0xJazkYdjfyTkM5RhMxjTsRKWjpKBFk6YOfcP7wQZVJMKvSKXkosFBMHgZfttoyfcoERMoItuZfbjR9DhQxBIxJ+/D9+QCT/dXqETmxZ6ftEeRKjqKF86GVnq/OYZVpqZth1EUyQxI7FcF2H9t6SmwR5KaK1eN13i5fB2XCuWAYResk63i9XZmD+idHERpi9NN6oVK7tz1WQBxPcl4UGqLG1VGY22ctlCcb0PI6GFj+DZqhErl1a3wrhMY22oCRhAwZGk68yK39nLti2isq+wYT+aYl8f7ZYWsp97xq3GHm8kCAwEAAaNTMFEwHQYDVR0OBBYEFL4Gvq/MygCukZfrLP5OE9nCKqA5MB8GA1UdIwQYMBaAFL4Gvq/MygCukZfrLP5OE9nCKqA5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGHfzhiMltgYqZHLn66GYOeY/8ugqu5zQK3D+SFVyxsfOsaQedoxyCqlBUlw1rRtdFUr2pC1xW1onPUcXlUzIkYypJ0AHZwlnfAfAKOSCrK38gsRQI6RDIhPIH7yuPHxyXGq6rWLUBzZpcb40EhWPK8o+KMG5i3cNrCC/+LSU4uL7QVJwkUeqltPBDABL5ZggoT9Dx85bUlU0PgQtEpbyFtt03kbkOut8tC4feiWzbRXAkvhwZhgqFDft+UeKUyF5z6MtScS7Q6oqnDGbyVCL0k77sXmv66mjD3J/wwUywnNSnlfWVfohJAY2E6b1IMYsihjBB8m1Ltb9F3CVrlB2DXtG8MgitBRuHeSAehpXss8676FOdApAVL4VnMoW2GC5JKYmpVA8yx5uZb6tMlRmLRly0GpxKx0Sy4D8joPXSExyjM8XHK22gMjgFYCJixDo3lhTzsLSKv9uwH9gdoxDg+F6gnLaihtTOwJRGcFTgj2S19iYQYWCLg2BNNC6Q8pmSh+KkIHOrf4a3nHVQhnm6fF0mtaKUnLg2D5ivPD8cJswOn+LZ4a75kbbeMcw2l+GArzeN5hhEDgCLwUnD11zhHcK/XYiI23fVLoIM+nOLykw2rtAW16QFjSAQ0FNODex/EiljOCUvSGY97rCQHdhd0UzehdiDakhIDPq2ZRF8Co</ns1:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns1:X509Certificate xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">MIIFFTCCAv2gAwIBAgIUHwEGLhFEa8Ow6G6Xpz4I572785cwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTIwMDMxODE1MDQwOFoXDTMwMDMxNjE1MDQwOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouQV4lrmp+k+7a8Q/kfovbIF9me1Ls4LMZ3PyqL5JYvAVd+KcMQG4GGEwQ7HHsSzQnhsypyQsZFQeWqtAu5H81KZL1i7DHqD2n2/DmYqfuV9l2f9FlQ1e3VTLtOWX2PlkmiN38VNTWWFAYDNeJg46EJHn/5kFIuBycVcR0wveaXDs8dtjOTSqSawfnwiGeUCv508OK3OD5L9U1snKp7trT5Q1EPLojnihfpqkol0UwecjSBPhd5Lpocm/VGKLfOqnMWLF71PJvu0QN9V4KMZ17rmD8IQlxo8TQQpcYKov55E7AwX9e0H/q9PjjmMVATAfCBVdUCHX93+VvUuQzEBGdT97F0ldbnZsrsp+ec4niKaeIqRYu77B0oWwNQfgJ0xJazkYdjfyTkM5RhMxjTsRKWjpKBFk6YOfcP7wQZVJMKvSKXkosFBMHgZfttoyfcoERMoItuZfbjR9DhQxBIxJ+/D9+QCT/dXqETmxZ6ftEeRKjqKF86GVnq/OYZVpqZth1EUyQxI7FcF2H9t6SmwR5KaK1eN13i5fB2XCuWAYResk63i9XZmD+idHERpi9NN6oVK7tz1WQBxPcl4UGqLG1VGY22ctlCcb0PI6GFj+DZqhErl1a3wrhMY22oCRhAwZGk68yK39nLti2isq+wYT+aYl8f7ZYWsp97xq3GHm8kCAwEAAaNTMFEwHQYDVR0OBBYEFL4Gvq/MygCukZfrLP5OE9nCKqA5MB8GA1UdIwQYMBaAFL4Gvq/MygCukZfrLP5OE9nCKqA5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGHfzhiMltgYqZHLn66GYOeY/8ugqu5zQK3D+SFVyxsfOsaQedoxyCqlBUlw1rRtdFUr2pC1xW1onPUcXlUzIkYypJ0AHZwlnfAfAKOSCrK38gsRQI6RDIhPIH7yuPHxyXGq6rWLUBzZpcb40EhWPK8o+KMG5i3cNrCC/+LSU4uL7QVJwkUeqltPBDABL5ZggoT9Dx85bUlU0PgQtEpbyFtt03kbkOut8tC4feiWzbRXAkvhwZhgqFDft+UeKUyF5z6MtScS7Q6oqnDGbyVCL0k77sXmv66mjD3J/wwUywnNSnlfWVfohJAY2E6b1IMYsihjBB8m1Ltb9F3CVrlB2DXtG8MgitBRuHeSAehpXss8676FOdApAVL4VnMoW2GC5JKYmpVA8yx5uZb6tMlRmLRly0GpxKx0Sy4D8joPXSExyjM8XHK22gMjgFYCJixDo3lhTzsLSKv9uwH9gdoxDg+F6gnLaihtTOwJRGcFTgj2S19iYQYWCLg2BNNC6Q8pmSh+KkIHOrf4a3nHVQhnm6fF0mtaKUnLg2D5ivPD8cJswOn+LZ4a75kbbeMcw2l+GArzeN5hhEDgCLwUnD11zhHcK/XYiI23fVLoIM+nOLykw2rtAW16QFjSAQ0FNODex/EiljOCUvSGY97rCQHdhd0UzehdiDakhIDPq2ZRF8Co</ns1:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/redirect"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">eduID Proxy IdP Sweden</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID Proxy IdP Sweden</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://eduid.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <ns0:GivenName>Administrative</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUHwEGLhFEa8Ow6G6Xpz4I572785cwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTIwMDMxODE1MDQwOFoXDTMwMDMxNjE1MDQwOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouQV4lrmp+k+7a8Q/kfovbIF9me1Ls4LMZ3PyqL5JYvAVd+KcMQG4GGEwQ7HHsSzQnhsypyQsZFQeWqtAu5H81KZL1i7DHqD2n2/DmYqfuV9l2f9FlQ1e3VTLtOWX2PlkmiN38VNTWWFAYDNeJg46EJHn/5kFIuBycVcR0wveaXDs8dtjOTSqSawfnwiGeUCv508OK3OD5L9U1snKp7trT5Q1EPLojnihfpqkol0UwecjSBPhd5Lpocm/VGKLfOqnMWLF71PJvu0QN9V4KMZ17rmD8IQlxo8TQQpcYKov55E7AwX9e0H/q9PjjmMVATAfCBVdUCHX93+VvUuQzEBGdT97F0ldbnZsrsp+ec4niKaeIqRYu77B0oWwNQfgJ0xJazkYdjfyTkM5RhMxjTsRKWjpKBFk6YOfcP7wQZVJMKvSKXkosFBMHgZfttoyfcoERMoItuZfbjR9DhQxBIxJ+/D9+QCT/dXqETmxZ6ftEeRKjqKF86GVnq/OYZVpqZth1EUyQxI7FcF2H9t6SmwR5KaK1eN13i5fB2XCuWAYResk63i9XZmD+idHERpi9NN6oVK7tz1WQBxPcl4UGqLG1VGY22ctlCcb0PI6GFj+DZqhErl1a3wrhMY22oCRhAwZGk68yK39nLti2isq+wYT+aYl8f7ZYWsp97xq3GHm8kCAwEAAaNTMFEwHQYDVR0OBBYEFL4Gvq/MygCukZfrLP5OE9nCKqA5MB8GA1UdIwQYMBaAFL4Gvq/MygCukZfrLP5OE9nCKqA5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGHfzhiMltgYqZHLn66GYOeY/8ugqu5zQK3D+SFVyxsfOsaQedoxyCqlBUlw1rRtdFUr2pC1xW1onPUcXlUzIkYypJ0AHZwlnfAfAKOSCrK38gsRQI6RDIhPIH7yuPHxyXGq6rWLUBzZpcb40EhWPK8o+KMG5i3cNrCC/+LSU4uL7QVJwkUeqltPBDABL5ZggoT9Dx85bUlU0PgQtEpbyFtt03kbkOut8tC4feiWzbRXAkvhwZhgqFDft+UeKUyF5z6MtScS7Q6oqnDGbyVCL0k77sXmv66mjD3J/wwUywnNSnlfWVfohJAY2E6b1IMYsihjBB8m1Ltb9F3CVrlB2DXtG8MgitBRuHeSAehpXss8676FOdApAVL4VnMoW2GC5JKYmpVA8yx5uZb6tMlRmLRly0GpxKx0Sy4D8joPXSExyjM8XHK22gMjgFYCJixDo3lhTzsLSKv9uwH9gdoxDg+F6gnLaihtTOwJRGcFTgj2S19iYQYWCLg2BNNC6Q8pmSh+KkIHOrf4a3nHVQhnm6fF0mtaKUnLg2D5ivPD8cJswOn+LZ4a75kbbeMcw2l+GArzeN5hhEDgCLwUnD11zhHcK/XYiI23fVLoIM+nOLykw2rtAW16QFjSAQ0FNODex/EiljOCUvSGY97rCQHdhd0UzehdiDakhIDPq2ZRF8Co</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUHwEGLhFEa8Ow6G6Xpz4I572785cwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTIwMDMxODE1MDQwOFoXDTMwMDMxNjE1MDQwOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAouQV4lrmp+k+7a8Q/kfovbIF9me1Ls4LMZ3PyqL5JYvAVd+KcMQG4GGEwQ7HHsSzQnhsypyQsZFQeWqtAu5H81KZL1i7DHqD2n2/DmYqfuV9l2f9FlQ1e3VTLtOWX2PlkmiN38VNTWWFAYDNeJg46EJHn/5kFIuBycVcR0wveaXDs8dtjOTSqSawfnwiGeUCv508OK3OD5L9U1snKp7trT5Q1EPLojnihfpqkol0UwecjSBPhd5Lpocm/VGKLfOqnMWLF71PJvu0QN9V4KMZ17rmD8IQlxo8TQQpcYKov55E7AwX9e0H/q9PjjmMVATAfCBVdUCHX93+VvUuQzEBGdT97F0ldbnZsrsp+ec4niKaeIqRYu77B0oWwNQfgJ0xJazkYdjfyTkM5RhMxjTsRKWjpKBFk6YOfcP7wQZVJMKvSKXkosFBMHgZfttoyfcoERMoItuZfbjR9DhQxBIxJ+/D9+QCT/dXqETmxZ6ftEeRKjqKF86GVnq/OYZVpqZth1EUyQxI7FcF2H9t6SmwR5KaK1eN13i5fB2XCuWAYResk63i9XZmD+idHERpi9NN6oVK7tz1WQBxPcl4UGqLG1VGY22ctlCcb0PI6GFj+DZqhErl1a3wrhMY22oCRhAwZGk68yK39nLti2isq+wYT+aYl8f7ZYWsp97xq3GHm8kCAwEAAaNTMFEwHQYDVR0OBBYEFL4Gvq/MygCukZfrLP5OE9nCKqA5MB8GA1UdIwQYMBaAFL4Gvq/MygCukZfrLP5OE9nCKqA5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGHfzhiMltgYqZHLn66GYOeY/8ugqu5zQK3D+SFVyxsfOsaQedoxyCqlBUlw1rRtdFUr2pC1xW1onPUcXlUzIkYypJ0AHZwlnfAfAKOSCrK38gsRQI6RDIhPIH7yuPHxyXGq6rWLUBzZpcb40EhWPK8o+KMG5i3cNrCC/+LSU4uL7QVJwkUeqltPBDABL5ZggoT9Dx85bUlU0PgQtEpbyFtt03kbkOut8tC4feiWzbRXAkvhwZhgqFDft+UeKUyF5z6MtScS7Q6oqnDGbyVCL0k77sXmv66mjD3J/wwUywnNSnlfWVfohJAY2E6b1IMYsihjBB8m1Ltb9F3CVrlB2DXtG8MgitBRuHeSAehpXss8676FOdApAVL4VnMoW2GC5JKYmpVA8yx5uZb6tMlRmLRly0GpxKx0Sy4D8joPXSExyjM8XHK22gMjgFYCJixDo3lhTzsLSKv9uwH9gdoxDg+F6gnLaihtTOwJRGcFTgj2S19iYQYWCLg2BNNC6Q8pmSh+KkIHOrf4a3nHVQhnm6fF0mtaKUnLg2D5ivPD8cJswOn+LZ4a75kbbeMcw2l+GArzeN5hhEDgCLwUnD11zhHcK/XYiI23fVLoIM+nOLykw2rtAW16QFjSAQ0FNODex/EiljOCUvSGY97rCQHdhd0UzehdiDakhIDPq2ZRF8Co</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/post"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/Saml2SP/sso/redirect"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eduID Proxy IdP Sweden</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduID Proxy IdP Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://eduid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Administrative</md:GivenName>
+    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idpproxy.dev.eduid.se-sp.xml b/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
index ecab0bb9..cd677c80 100644
--- a/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
+++ b/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
@@ -4,15 +4,15 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-20T21:04:54Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <ns2:EntityAttributes xmlns:ns2="urn:oasis:names:tc:SAML:metadata:attribute">
-      <ns3:Attribute xmlns:ns3="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">
-        <ns3:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</ns3:AttributeValue>
-      </ns3:Attribute>
-    </ns2:EntityAttributes>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns5:DiscoveryResponse xmlns:ns5="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idpproxy.dev.eduid.se/Saml2SP/disco" index="1"/>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idpproxy.dev.eduid.se/Saml2SP/disco" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">eduID Proxy SP Sverige</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">eduID Proxy SP Sweden</mdui:DisplayName>
@@ -25,11 +25,11 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUKEpu1hDfOfFWEi8nMq18Vma5tlIwDQYJKoZIhvcNAQEL
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUKEpu1hDfOfFWEi8nMq18Vma5tlIwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwMzE4MTUwNDA1WhcN
 MzAwMzE2MTUwNDA1WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMM5n/Mk2/c1VK9n40FIH1NipHPRIbcX
@@ -57,14 +57,14 @@ aFuAEpFqkvRJwQT9fGUZYwzhbpYRe+pWqvB+gxCAI/0Wj/dw1nHl1bv+uCLIask5
 78BB+0w4ReixPa7kqRImfA2hyywig9o05Ujr22mq+R8eyzWXpXeJz1KuuqmEK9UP
 rZkPdbEo7RWd1WEorEEtb9EOKsnhiuj5ZwQmFMt3NX76nWdFDwhNAi3X0r7M/CnE
 8R/2hYQAIg==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUKEpu1hDfOfFWEi8nMq18Vma5tlIwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUKEpu1hDfOfFWEi8nMq18Vma5tlIwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwMzE4MTUwNDA1WhcN
 MzAwMzE2MTUwNDA1WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMM5n/Mk2/c1VK9n40FIH1NipHPRIbcX
@@ -92,28 +92,28 @@ aFuAEpFqkvRJwQT9fGUZYwzhbpYRe+pWqvB+gxCAI/0Wj/dw1nHl1bv+uCLIask5
 78BB+0w4ReixPa7kqRImfA2hyywig9o05Ujr22mq+R8eyzWXpXeJz1KuuqmEK9UP
 rZkPdbEo7RWd1WEorEEtb9EOKsnhiuj5ZwQmFMt3NX76nWdFDwhNAi3X0r7M/CnE
 8R/2hYQAIg==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">eduID Proxy SP</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID Proxy SP</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://eduid.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <ns0:GivenName>Administrative</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:feedback@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/redirect" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eduID Proxy SP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduID Proxy SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://eduid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Administrative</md:GivenName>
+    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml b/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
index 3c8d0514..46564a7c 100644
--- a/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpv4.lu.se-idp-shibboleth.xml
@@ -4,23 +4,23 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-05-28T12:09:49Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al3</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idpv4.lu.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idpv4.lu.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
@@ -41,9 +41,8 @@
         <mdui:DomainHint>lth.se</mdui:DomainHint>
         <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <!-- First signing certificate is BackChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -72,9 +71,8 @@
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <!-- Second signing certificate is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -103,8 +101,8 @@
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -133,21 +131,20 @@
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv4.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv4.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv4.lu.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv4.lu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv4.lu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" req-attr:supportsRequestedAttributes="true" Location="https://idpv4.lu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" req-attr:supportsRequestedAttributes="true" Location="https://idpv4.lu.se/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv4.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv4.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv4.lu.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv4.lu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv4.lu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://idpv4.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://idpv4.lu.se/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-    </Extensions>
-    <!-- First signing certificate is BackChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -176,9 +173,8 @@
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <!-- Second signing certificate is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -207,8 +203,8 @@
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -237,27 +233,27 @@
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv4.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lu.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Eskil</GivenName>
-    <SurName>Swahn</SurName>
-    <EmailAddress>mailto:eskil.swahn@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <SurName>LU Servicedesk</SurName>
-    <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>IRT Lund University</GivenName>
-    <EmailAddress>mailto:abuse@lu.se</EmailAddress>
-    <TelephoneNumber>+46462229000</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv4.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eskil</md:GivenName>
+    <md:SurName>Swahn</md:SurName>
+    <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>LU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>IRT Lund University</md:GivenName>
+    <md:EmailAddress>mailto:abuse@lu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46462229000</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml b/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
index d83889f7..ac2a5b44 100644
--- a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
+++ b/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- v20210623 -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://inacademia.org/metadata/inacademia-simple-validation.xml">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-10T18:49:39Z">
diff --git a/swamid-2.0/indico.nordu.net-mellon.xml b/swamid-2.0/indico.nordu.net-mellon.xml
index 5c2af9f0..f300137a 100644
--- a/swamid-2.0/indico.nordu.net-mellon.xml
+++ b/swamid-2.0/indico.nordu.net-mellon.xml
@@ -5,13 +5,13 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Indico NORDUnet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="da">Indico NORDUnet</mdui:DisplayName>
@@ -21,54 +21,54 @@
         <mdui:Description xml:lang="sv">Indico NORDUnet är en mötes- och konferenssamarbetsservice.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://indico.nordu.net/privacy-statement/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEvTCCAqUCFA5ORy4xhWVYr4K0A+z+Wm6l3eoGMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGluZGljby5ub3JkdS5uZXQwHhcNMTkwOTAzMTM0MzU1WhcNMjkwOTAyMTM0MzU1WjAbMRkwFwYDVQQDDBBpbmRpY28ubm9yZHUubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5qHznB3r03a/N9JLY28K+Lw7lnoke7dqRFSBWIkBB58NlH0MF/m/eL/gWnlOLNZfE9AfURWzGIbid6mrZUF/ZdrDcJFRq9zrQyCjE4kkxMxbwYAJsO/RUQyuiEmVYBHk8Y06MicHDa10TD5jyDgGIz+JjD5q6ZTrnhfos6o4la38Z5jNUV1y1LOeeGcD1sc8MWj0V7Wv/TjhWuTE7KHifdXEam27jwh/iXrHQeZm07GPj+vytUe9mPa+b+yr9b0brOaXOPYUkrugRRKZlG1tQLPxEq9HosnxPLG7xnUIsHUWUg4rK/ywz+FrGXKG6e5CHfjfSg8L3jNXGEgqCu9Ob1SRTTZeBMPvEhqhAy0kRmFy7aMu/yDueGR/VYJFwmdKV/XTCxy2lbMalFaVfpitckkRij+cik0i66ET2JHbxfsOd5dAVBRrbZ3NcwulbdWFl07OQaXmHJr6YX46eG65BgVaS/6Os0NQCu0+pidSPge4O1W5TN/C7LCLi4jYVeO/fQ7Qr2zEXrgVEHFAblbD26z0eVuHrcIzJbjfgB1x1+vIPmAq1QnkgXSC4oJDVNosMzyCRwF1RG0s9oHrUysMbNafwJgDMMaBJ4HRrXp8b1TbW8aOTOh+MyQTfO2Wb91nkwDaOTz5oUNZSei8YAj8iOo42hFTlW/IRr1lP7nEjUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAxP8ByZzJGuQD8FisLfbH1vctQwHFBB8lQBlONaTDVM48kKrIAcWFdgx4ocn/O4053mqulsk1Bgv05LbuUckuTmgcCi7NDOyPUDEfgkhMsDLxcFe3yf0Kx8SX3SEamfDHR+MVHZOU6MJWGcPZOqmD8gvUPKcRxm1o1xp9HJ91dhKzoHQYv5KMDcZTi5MbCH+cCzYGjPBDYLcB89h3f4Lpx4UqJ4HAfB30R5G+gHXu8vvrQs4nKI7AVI+I34d4XMHyb33+nEmoXRRJuVNOlEexSoGg9keSv2EqkrX/DBijiB3WPctrTXROQOVwNruAkdUF4jZpZdmmWFHyJwPIXAP2NTLeDZnyKygy+fntXxByI+hO92CmC2DOQKzvOPcH7apMV4nmgtQg8ioRjdzrKtcM0ZaEw3B5OLZmYiRaIjT6fYfyaauQGxUgHMeuhgVOYy0vra18nKBXupSXBc9LJhwK8hz69cZ04UkUFuhsDE8Ej2wD9NMKKI5xnrTNM93hHwxvsW5depOrvJY/NqDNJtFqxvlEpoouUevIF4dxuYn3ZQVCVAN2rlkqY7TYY+QG4Nhd+oWJgzKNlR5Ydqk12ODFSujq7L1eOZ7Lypb58jVn6OFlJ8+rup2kAfFZ9IZ9HkVnVoQPdv11zNbDrt03dOMTHgvdEfVmvp0UmfY+c+e24Y8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEvTCCAqUCFA5ORy4xhWVYr4K0A+z+Wm6l3eoGMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGluZGljby5ub3JkdS5uZXQwHhcNMTkwOTAzMTM0MzU1WhcNMjkwOTAyMTM0MzU1WjAbMRkwFwYDVQQDDBBpbmRpY28ubm9yZHUubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5qHznB3r03a/N9JLY28K+Lw7lnoke7dqRFSBWIkBB58NlH0MF/m/eL/gWnlOLNZfE9AfURWzGIbid6mrZUF/ZdrDcJFRq9zrQyCjE4kkxMxbwYAJsO/RUQyuiEmVYBHk8Y06MicHDa10TD5jyDgGIz+JjD5q6ZTrnhfos6o4la38Z5jNUV1y1LOeeGcD1sc8MWj0V7Wv/TjhWuTE7KHifdXEam27jwh/iXrHQeZm07GPj+vytUe9mPa+b+yr9b0brOaXOPYUkrugRRKZlG1tQLPxEq9HosnxPLG7xnUIsHUWUg4rK/ywz+FrGXKG6e5CHfjfSg8L3jNXGEgqCu9Ob1SRTTZeBMPvEhqhAy0kRmFy7aMu/yDueGR/VYJFwmdKV/XTCxy2lbMalFaVfpitckkRij+cik0i66ET2JHbxfsOd5dAVBRrbZ3NcwulbdWFl07OQaXmHJr6YX46eG65BgVaS/6Os0NQCu0+pidSPge4O1W5TN/C7LCLi4jYVeO/fQ7Qr2zEXrgVEHFAblbD26z0eVuHrcIzJbjfgB1x1+vIPmAq1QnkgXSC4oJDVNosMzyCRwF1RG0s9oHrUysMbNafwJgDMMaBJ4HRrXp8b1TbW8aOTOh+MyQTfO2Wb91nkwDaOTz5oUNZSei8YAj8iOo42hFTlW/IRr1lP7nEjUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAxP8ByZzJGuQD8FisLfbH1vctQwHFBB8lQBlONaTDVM48kKrIAcWFdgx4ocn/O4053mqulsk1Bgv05LbuUckuTmgcCi7NDOyPUDEfgkhMsDLxcFe3yf0Kx8SX3SEamfDHR+MVHZOU6MJWGcPZOqmD8gvUPKcRxm1o1xp9HJ91dhKzoHQYv5KMDcZTi5MbCH+cCzYGjPBDYLcB89h3f4Lpx4UqJ4HAfB30R5G+gHXu8vvrQs4nKI7AVI+I34d4XMHyb33+nEmoXRRJuVNOlEexSoGg9keSv2EqkrX/DBijiB3WPctrTXROQOVwNruAkdUF4jZpZdmmWFHyJwPIXAP2NTLeDZnyKygy+fntXxByI+hO92CmC2DOQKzvOPcH7apMV4nmgtQg8ioRjdzrKtcM0ZaEw3B5OLZmYiRaIjT6fYfyaauQGxUgHMeuhgVOYy0vra18nKBXupSXBc9LJhwK8hz69cZ04UkUFuhsDE8Ej2wD9NMKKI5xnrTNM93hHwxvsW5depOrvJY/NqDNJtFqxvlEpoouUevIF4dxuYn3ZQVCVAN2rlkqY7TYY+QG4Nhd+oWJgzKNlR5Ydqk12ODFSujq7L1eOZ7Lypb58jVn6OFlJ8+rup2kAfFZ9IZ9HkVnVoQPdv11zNbDrt03dOMTHgvdEfVmvp0UmfY+c+e24Y8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.nordu.net/mellon/logout"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.nordu.net/mellon/logout"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.nordu.net/mellon/postResponse"/>
-    <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.nordu.net/mellon/artifactResponse"/>
-    <AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.nordu.net/mellon/paosResponse"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Indico NORDUnet</ServiceName>
-      <ServiceName xml:lang="da">Indico NORDUnet</ServiceName>
-      <ServiceName xml:lang="sv">Indico NORDUnet</ServiceName>
-      <ServiceDescription xml:lang="en">
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.nordu.net/mellon/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.nordu.net/mellon/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.nordu.net/mellon/postResponse"/>
+    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.nordu.net/mellon/artifactResponse"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.nordu.net/mellon/paosResponse"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Indico NORDUnet</md:ServiceName>
+      <md:ServiceName xml:lang="da">Indico NORDUnet</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Indico NORDUnet</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
         Indico NORDUnet is a meeting, workshop and conference collaboration service.
-      </ServiceDescription>
-      <ServiceDescription xml:lang="da">
+      </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">
         Indico NORDUnet er en samarbejds platform til at arrangere møder, workshops og konferencer.
-      </ServiceDescription>
-      <ServiceDescription xml:lang="sv">
+      </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">
         Indico NORDUnet är en mötes- och konferenssamarbetsservice.
-      </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="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">NORDUnet</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.nordu.net</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Administrator</GivenName>
-    <EmailAddress>mailto:sei@nordu.net</EmailAddress>
-  </ContactPerson>
+      </md:ServiceDescription>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md: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="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>mailto:sei@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml b/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
index 94152078..98447c27 100644
--- a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
+++ b/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://integratorsportal.ladok.se/shibboleth">
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml b/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
index ba24f3f1..a4c55444 100644
--- a/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://jira-dev.its.umu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-02T09:29:53Z">
diff --git a/swamid-2.0/jira-next.its.umu.se-shibboleth.xml b/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
index 0c0871b8..2dee63ff 100644
--- a/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://jira-next.its.umu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-02T09:29:53Z">
diff --git a/swamid-2.0/jira.its.umu.se-shibboleth.xml b/swamid-2.0/jira.its.umu.se-shibboleth.xml
index 10724011..1b984922 100644
--- a/swamid-2.0/jira.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira.its.umu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://jira.its.umu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-26T14:42:27Z">
diff --git a/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml b/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
index 1dfe5fdc..6c68d141 100644
--- a/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
+++ b/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
@@ -5,16 +5,16 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisco:DiscoveryResponse xmlns:idpdisco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://juridicum.blackboard.com/auth-saml/saml/login?disco=true" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://juridicum.blackboard.com/auth-saml/saml/login?disco=true" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Juridiska fakultetens läroplattform</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Learning management system for the Faculty of Law</mdui:DisplayName>
diff --git a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
index 71134b2e..11ba6379 100644
--- a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
@@ -4,21 +4,21 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-05-02T22:24:01Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
@@ -26,18 +26,18 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saas-idp-test.swamid.se/Saml2/disco" index="1"/>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saas-idp-test.swamid.se/Saml2/disco" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">SUNET Play</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://sunet.se</mdui:InformationURL>
       </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
 BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
 MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
@@ -54,14 +54,14 @@ MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
 OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
 2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
 vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
 BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
 MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
@@ -78,24 +78,24 @@ MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
 OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
 2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
 vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.se/Saml2/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">SUNET Play</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">SUNET Play</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.se/Saml2/acs/redirect" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET Play</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET Play</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kau.instructure.com-saml2.xml b/swamid-2.0/kau.instructure.com-saml2.xml
index a2484ffa..c0e8f102 100644
--- a/swamid-2.0/kau.instructure.com-saml2.xml
+++ b/swamid-2.0/kau.instructure.com-saml2.xml
@@ -24,9 +24,9 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -48,17 +48,17 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -80,9 +80,9 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://kau.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://kau.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
diff --git a/swamid-2.0/kb-se.zoom.us.xml b/swamid-2.0/kb-se.zoom.us.xml
index 464599a3..957bde32 100644
--- a/swamid-2.0/kb-se.zoom.us.xml
+++ b/swamid-2.0/kb-se.zoom.us.xml
@@ -21,7 +21,6 @@
         <mdui:Description xml:lang="en">This is the National Library of Sweden's E-Meeting service</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <!-- New certs for 2022-2023 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -100,7 +99,6 @@ mYIp+qov+EzUDeCQ
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- OLD Certs expires 2022-02-02 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
diff --git a/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml b/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
index c7d584d7..29e7a060 100644
--- a/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
+++ b/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
@@ -40,16 +40,16 @@
     <md:OrganizationDisplayName xml:lang="en">Ex Libris (Germany)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.exlibrisgroup.com</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <SurName>Caroline Myrberg</SurName>
-    <EmailAddress>mailto:caroline.myrberg@ki.se</EmailAddress>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Caroline Myrberg</md:SurName>
+    <md:EmailAddress>mailto:caroline.myrberg@ki.se</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <SurName>Frank Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Frank Bieber</md:SurName>
+    <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Frank Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frank Bieber</md:SurName>
+    <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml b/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
index 32229302..c0e98f0e 100644
--- a/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
+++ b/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
@@ -40,16 +40,16 @@
     <md:OrganizationDisplayName xml:lang="en">Ex Libris (Germany)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.exlibrisgroup.com</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <SurName>Caroline Myrberg</SurName>
-    <EmailAddress>mailto:caroline.myrberg@ki.se</EmailAddress>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Caroline Myrberg</md:SurName>
+    <md:EmailAddress>mailto:caroline.myrberg@ki.se</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <SurName>Frank Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Frank Bieber</md:SurName>
+    <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Frank Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frank Bieber</md:SurName>
+    <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml b/swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml
index 915528a3..4c177456 100644
--- a/swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://kitstidp01.tst.ki.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://kitstidp01.tst.ki.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Karolinska Institutet (test)</mdui:DisplayName>
@@ -34,8 +34,8 @@
         <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIVAIm5/NzznT2W6uoVD+vSRqP3mWrOMA0GCSqGSIb3DQEB
@@ -58,24 +58,24 @@ DwcT/8GOhAzb+Bnypcu2EM8I1c9rbi93d71Cmk3oXHmGD9oGjx7oNCVHuJyYg3Zj
 A0LBqZYRQ54hscO4+i1YqA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kitstidp01.tst.ki.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kitstidp01.tst.ki.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitstidp01.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIVAIm5/NzznT2W6uoVD+vSRqP3mWrOMA0GCSqGSIb3DQEB
@@ -98,10 +98,10 @@ DwcT/8GOhAzb+Bnypcu2EM8I1c9rbi93d71Cmk3oXHmGD9oGjx7oNCVHuJyYg3Zj
 A0LBqZYRQ54hscO4+i1YqA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp01.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kitstidp02.tst.ki.se.xml b/swamid-2.0/kitstidp02.tst.ki.se.xml
index 1d1571d5..341cc72b 100644
--- a/swamid-2.0/kitstidp02.tst.ki.se.xml
+++ b/swamid-2.0/kitstidp02.tst.ki.se.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://kitstidp02.tst.ki.se">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-01-17T14:17:55Z">
diff --git a/swamid-2.0/klara.port.se-shibboleth.xml b/swamid-2.0/klara.port.se-shibboleth.xml
index c2d05537..c13f2480 100644
--- a/swamid-2.0/klara.port.se-shibboleth.xml
+++ b/swamid-2.0/klara.port.se-shibboleth.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Metadata Temporary KLARA chemical management system 2020-09-03 Ecoonline sweden AB, expires october 2020
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://klara.port.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-22T14:09:19Z">
diff --git a/swamid-2.0/konto.gih.se-saml2.xml b/swamid-2.0/konto.gih.se-saml2.xml
index 4f9b4faa..e8dd3899 100644
--- a/swamid-2.0/konto.gih.se-saml2.xml
+++ b/swamid-2.0/konto.gih.se-saml2.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Kontoaktivering GIH</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Account activation GIH</mdui:DisplayName>
@@ -20,32 +20,32 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://konto.gih.se/Privacy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://konto.gih.se/Privacy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDnDCCAoQCCQDUoxu5UQ0s4DANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAcMCVN0b2NraG9sbTErMCkGA1UECgwiR3ltbmFzdGlrLSBvY2ggaWRyb3R0c2jDg8K2Z3Nrb2xhbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDFNQIFNhbWwgUHJvZDEbMBkGCSqGSIb3DQEJARYMaXRvcHNAZ2loLnNlMB4XDTIxMDcwOTA4MzY1M1oXDTMxMDcwNzA4MzY1M1owgY8xCzAJBgNVBAYTAlNFMRIwEAYDVQQHDAlTdG9ja2hvbG0xKzApBgNVBAoMIkd5bW5hc3Rpay0gb2NoIGlkcm90dHNow4PCtmdza29sYW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxTUCBTYW1sIFByb2QxGzAZBgkqhkiG9w0BCQEWDGl0b3BzQGdpaC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwmr0ZzicugWggGJmTbZeaJrQ/DcMXdHC1cpOGUxG7XR5ciQb5o7qPnWl+3mrzXnfRbwWTHNcybezREUADuUtKqKbyfs/lEJ7iK0vVp4uzkmWG0cYR3Rx0Ob3I32vdttG6WSDwzHW6+ZpFybSOybj0qbXxAnZdKKsjlblBADeFWFchaRr+NfALbIhTKzCZEFIMH4mFSmMuHlXJBtpQnE525wunEpnyI5+2qd5g4+/dkcQoXP/XbenXONfX5xyXMUF9gZO5r480KrP7ADh2LfZAmxl77yzUikT65Ii091u3tAlvNEWFvTWWWtbXCCprz7BLYijpbg3NY+vuS7ZV9TMECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAqtctvcm7yzXgzXovp9Xk94DQKmRg7QBR2lq2O5V2yNsDG5a6CwwCWs0Adc6jptR0k0cBeT2DoPjKxHeuJj/GemtPN91s2rBLjaW8GsrcVM9EZPHnCc6dF3eouRzsTjki84jcrFHcCnbYsXgFN1bhElCNSup0r2hHIyoHOOP7VpffhHZaI4a5l3TqJDAmyWQYuJeW0zv41RgoessR/PUe2ROkJ0HXieDZ36nqepfsXRM7szIaTLTwcElRXyFK2DqNduD3DkAmgwM5AR4V9y+FArcmd00Qjs9WDGIk7e27KW1+XU8PP+U+ki8qKu0oK8OOedFTf+hW+KcK42LoULVVpw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.gih.se/Saml2/Logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.gih.se/Saml2/Acs" isDefault="true" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.gih.se/Saml2/Acs" isDefault="false" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDnDCCAoQCCQDUoxu5UQ0s4DANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAcMCVN0b2NraG9sbTErMCkGA1UECgwiR3ltbmFzdGlrLSBvY2ggaWRyb3R0c2jDg8K2Z3Nrb2xhbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDFNQIFNhbWwgUHJvZDEbMBkGCSqGSIb3DQEJARYMaXRvcHNAZ2loLnNlMB4XDTIxMDcwOTA4MzY1M1oXDTMxMDcwNzA4MzY1M1owgY8xCzAJBgNVBAYTAlNFMRIwEAYDVQQHDAlTdG9ja2hvbG0xKzApBgNVBAoMIkd5bW5hc3Rpay0gb2NoIGlkcm90dHNow4PCtmdza29sYW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxTUCBTYW1sIFByb2QxGzAZBgkqhkiG9w0BCQEWDGl0b3BzQGdpaC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwmr0ZzicugWggGJmTbZeaJrQ/DcMXdHC1cpOGUxG7XR5ciQb5o7qPnWl+3mrzXnfRbwWTHNcybezREUADuUtKqKbyfs/lEJ7iK0vVp4uzkmWG0cYR3Rx0Ob3I32vdttG6WSDwzHW6+ZpFybSOybj0qbXxAnZdKKsjlblBADeFWFchaRr+NfALbIhTKzCZEFIMH4mFSmMuHlXJBtpQnE525wunEpnyI5+2qd5g4+/dkcQoXP/XbenXONfX5xyXMUF9gZO5r480KrP7ADh2LfZAmxl77yzUikT65Ii091u3tAlvNEWFvTWWWtbXCCprz7BLYijpbg3NY+vuS7ZV9TMECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAqtctvcm7yzXgzXovp9Xk94DQKmRg7QBR2lq2O5V2yNsDG5a6CwwCWs0Adc6jptR0k0cBeT2DoPjKxHeuJj/GemtPN91s2rBLjaW8GsrcVM9EZPHnCc6dF3eouRzsTjki84jcrFHcCnbYsXgFN1bhElCNSup0r2hHIyoHOOP7VpffhHZaI4a5l3TqJDAmyWQYuJeW0zv41RgoessR/PUe2ROkJ0HXieDZ36nqepfsXRM7szIaTLTwcElRXyFK2DqNduD3DkAmgwM5AR4V9y+FArcmd00Qjs9WDGIk7e27KW1+XU8PP+U+ki8qKu0oK8OOedFTf+hW+KcK42LoULVVpw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.gih.se/Saml2/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.gih.se/Saml2/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.gih.se/Saml2/Acs" isDefault="false" index="1"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Kontoaktivering GIH</md:ServiceName>
       <md:ServiceName xml:lang="en">Account activation GIH</md:ServiceName>
       <md: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"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">GIH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">GIH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.gih.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Michael</GivenName>
-    <SurName>Thunell</SurName>
-    <EmailAddress>mailto:itops@gih.se</EmailAddress>
-  </ContactPerson>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">GIH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">GIH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.gih.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Thunell</md:SurName>
+    <md:EmailAddress>mailto:itops@gih.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/konto.his.se.xml b/swamid-2.0/konto.his.se.xml
index 5b372767..2c0d1b50 100644
--- a/swamid-2.0/konto.his.se.xml
+++ b/swamid-2.0/konto.his.se.xml
@@ -5,7 +5,6 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <!-- GEANT -->
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
@@ -13,7 +12,6 @@
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <!-- Login and Discovery User Interface (MDUI) -->
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Användarkonto vid Högskolan i Skövde</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">User account at University of Skövde</mdui:DisplayName>
@@ -101,11 +99,9 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- Consuming Servers -->
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-konto.his.se:8444/Auth/AssertionConsumerService" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epidev2.hs.local:446/Auth/AssertionConsumerService" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.his.se/Auth/AssertionConsumerService" index="3"/>
-    <!-- Attributes -->
     <md:AttributeConsumingService index="0" isDefault="true">
       <md:ServiceName xml:lang="sv">Kontohantering</md:ServiceName>
       <md:ServiceName xml:lang="en">Account management</md:ServiceName>
@@ -115,8 +111,6 @@
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <!-- Organization -->
-  <!-- Contacts -->
   <md:Organization>
     <md:OrganizationName xml:lang="sv">HIS</md:OrganizationName>
     <md:OrganizationName xml:lang="en">HIS</md:OrganizationName>
diff --git a/swamid-2.0/kurser.math.su.se-shibboleth.xml b/swamid-2.0/kurser.math.su.se-shibboleth.xml
index 4d2af70a..d9264dec 100644
--- a/swamid-2.0/kurser.math.su.se-shibboleth.xml
+++ b/swamid-2.0/kurser.math.su.se-shibboleth.xml
@@ -149,8 +149,6 @@ r+TncAEB8Ab193KqbVs9FpIQ120x4uecog==
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <!-- ORGANIZATION INFO -->
-  <!-- CONTACTS -->
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SU, Matematiska institutionen</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SU, Department of Mathematics </md:OrganizationName>
diff --git a/swamid-2.0/local.cloudmore.com-shibboleth.xml b/swamid-2.0/local.cloudmore.com-shibboleth.xml
index 72431fd5..4ade3608 100644
--- a/swamid-2.0/local.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/local.cloudmore.com-shibboleth.xml
@@ -20,10 +20,10 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/localhost-52465-authservices.xml b/swamid-2.0/localhost-52465-authservices.xml
index 001b42d1..a4403dc7 100644
--- a/swamid-2.0/localhost-52465-authservices.xml
+++ b/swamid-2.0/localhost-52465-authservices.xml
@@ -4,40 +4,40 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-04-29T12:49:22Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi: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>
-    </EntityAttributes>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="sv">Quicksearch Feedback solutions</DisplayName>
-        <DisplayName xml:lang="en">Quicksearch Feedback solutions</DisplayName>
-        <Description xml:lang="sv">Quicksearch Feedback solutions for HR surveys.</Description>
-        <Description xml:lang="en">Quicksearch Feedback solutions för HR-undersökningar</Description>
-        <PrivacyStatementURL xml:lang="sv">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</PrivacyStatementURL>
-        <PrivacyStatementURL xml:lang="en">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</PrivacyStatementURL>
-      </UIInfo>
-    </Extensions>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost:52465/AuthServices/Acs" isDefault="true" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://localhost:52465/AuthServices/Acs" isDefault="false" index="1"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">quicksearch.se</ServiceName>
-      <RequestedAttribute Name="Minimal"/>
-      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Quicksearch</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Quick search Sweden AB</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.quicksearch.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <EmailAddress>mailto:info@quicksearch.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <EmailAddress>mailto:info@quicksearch.se</EmailAddress>
-  </ContactPerson>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Quicksearch Feedback solutions</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Quicksearch Feedback solutions</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Quicksearch Feedback solutions for HR surveys.</mdui:Description>
+        <mdui:Description xml:lang="en">Quicksearch Feedback solutions för HR-undersökningar</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost:52465/AuthServices/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://localhost:52465/AuthServices/Acs" isDefault="false" index="1"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">quicksearch.se</md:ServiceName>
+      <md:RequestedAttribute Name="Minimal"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Quicksearch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Quick search Sweden AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.quicksearch.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:info@quicksearch.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:info@quicksearch.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.ki.se-idp-shibboleth.xml b/swamid-2.0/login.ki.se-idp-shibboleth.xml
index 39c67366..8b64238d 100644
--- a/swamid-2.0/login.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.ki.se-idp-shibboleth.xml
@@ -5,18 +5,18 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.ki.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.ki.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
@@ -46,8 +46,8 @@
         <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -71,8 +71,8 @@ GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -96,8 +96,8 @@ kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -121,20 +121,20 @@ BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ki.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ki.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ki.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -158,8 +158,8 @@ GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -183,8 +183,8 @@ kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -208,36 +208,36 @@ BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">KI</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karolinska Institutet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karolinska Institutet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ki.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Karolinska Institutet</Company>
-    <SurName>Parisa Farzbod</SurName>
-    <EmailAddress>mailto:parisa.farzbod@ki.se</EmailAddress>
-    <TelephoneNumber>+46 8 524 86488</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Karolinska Institutet</Company>
-    <SurName>Eric Johansson</SurName>
-    <EmailAddress>mailto:eric.johansson@ki.se</EmailAddress>
-    <TelephoneNumber>+46 8 524 86382</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Karolinska Institutet</Company>
-    <SurName>IT-support</SurName>
-    <EmailAddress>mailto:it-support@ki.se</EmailAddress>
-    <TelephoneNumber>+46 8 524 82222</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Security Response Team</GivenName>
-    <EmailAddress>mailto:abuse@ki.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Parisa Farzbod</md:SurName>
+    <md:EmailAddress>mailto:parisa.farzbod@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86488</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Eric Johansson</md:SurName>
+    <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@ki.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.quicksearch.se-AuthServices.xml b/swamid-2.0/login.quicksearch.se-AuthServices.xml
index 33aae0a1..5c1fd18b 100644
--- a/swamid-2.0/login.quicksearch.se-AuthServices.xml
+++ b/swamid-2.0/login.quicksearch.se-AuthServices.xml
@@ -4,51 +4,51 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-05-11T15:12:09Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi: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>
-    </EntityAttributes>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="sv">Quicksearch Feedback solutions</DisplayName>
-        <DisplayName xml:lang="en">Quicksearch Feedback solutions</DisplayName>
-        <Description xml:lang="sv">Quicksearch Feedback solutions for HR surveys.</Description>
-        <Description xml:lang="en">Quicksearch Feedback solutions för HR-undersökningar</Description>
-        <PrivacyStatementURL xml:lang="sv">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</PrivacyStatementURL>
-        <PrivacyStatementURL xml:lang="en">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</PrivacyStatementURL>
-      </UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIGnDCCBYSgAwIBAgIMLUQQnefHcE9BN5M4MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxODAeFw0yMjAxMTIxMDExMjlaFw0yMzAyMTMxMDExMjlaMG0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdIYWxsYW5kMREwDwYDVQQHDAhIYWxtc3RhZDEeMBwGA1UECgwVUXVpY2tzZWFyY2ggU3dlZGVuIEFCMRkwFwYDVQQDDBAqLnF1aWNrc2VhcmNoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCqSVIBBFR3LsPpQ55mVCnCWj9Hmxdx2Qo5Awx79v50VHdAFfef5Cx3/Yj+U3SGU1u+HSJLtKbkPTZaY8H8AMb/lOtHH8ajBqF1ZFLCXgkW9qIRuABb+guvb3HExLyAKk8SjRl7x/Bhy0u0FBZHUbUT8BoXFRH7f4avGXZ4vbZX+hqdVKv2JFqG4KsQQv7KxSuCtcuUzOpECkw7f85Ie/ZDPtKSVMIsEXFAH3MTep/CJFoJJ4q/Pr1HFRaPW8euhXHBT7qii7B2zMG2tgLwtM4OMFOkKlQxdbob7GxTQ89g86vRVgrAS+SD+H2L//OG+GY68+/pQSveyrs4lLLG/xQIDAQABo4IDVzCCA1MwDgYDVR0PAQH/BAQDAgWgMIGOBggrBgEFBQcBAQSBgTB/MEQGCCsGAQUFBzAChjhodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc3JzYW92c3NsY2EyMDE4LmNydDA3BggrBgEFBQcwAYYraHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3Nyc2FvdnNzbGNhMjAxODBWBgNVHSAETzBNMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAIBgZngQwBAgIwCQYDVR0TBAIwADA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzcnNhb3Zzc2xjYTIwMTguY3JsMCsGA1UdEQQkMCKCECoucXVpY2tzZWFyY2guc2WCDnF1aWNrc2VhcmNoLnNlMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT473/yzXhnqN5vjySNiPGHAwKz6zAdBgNVHQ4EFgQUUjzFqjl5RmmU2JejpbwKF08vNDkwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB1AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABfk3Fd4YAAAQDAEYwRAIgAvmUhktndi+QegG9T5TskY2lMmARymjlgRxmvGEghUkCIFpu8ZRVOtvE8LUDRt0elt2TZ7r2B2jt6s0FuvTkAsVFAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF+TcV2cAAABAMARzBFAiEAvc1k+DDlchjxVzqw9moGgLJtqATm7oVxHNJgldGqHIwCIGhlfV+uobLsduhtaT4BMKHDJRFUczKMpp6rQroK/ZPnAHcANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+TcV3VAAABAMASDBGAiEAtsHXKDhDrqZj08uu6p90/rvgrjRILyIdgGlfHx1f2iECIQDg26MCmOQeAvQTRFqfHN2eKNgvD7K2Dj5a6n3zKDP5bjANBgkqhkiG9w0BAQsFAAOCAQEABNZP0v917f8ZxLwdFrk23lq2Lru0pNWf1raqvy5/sKjQJO4zEbZwq1g1/P9u9QY2cxmj0Q+iEiJMILP2B8nA2HUbM70NHvs7f2tMkfWhsulZy9f5I2jJ3c+Vz8LhjQXIIsXIAURPmgtxC1m4uQEfxCinsyktlWNNIEwFnHBQesn/tb5BVyLGGaFPtmFN4Yx+hDE5DD2EREbsZLCienCPaJQgmifrrGrGlstOc6EM1YaZMyvXGPUZ1GEVtBG9uC8fFsjLIKHcqT8v03f0qmVFKejSWdW6uPS2eC1ca+s8JkFUhZBGDJvkoN7q+HU/JwShBilvr+DFRQLB5tzdGGqbrQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.quicksearch.se/AuthServices/Logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.quicksearch.se/AuthServices/Acs" isDefault="true" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.quicksearch.se/AuthServices/Acs" isDefault="false" index="1"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">quicksearch.se</ServiceName>
-      <RequestedAttribute Name="Minimal"/>
-      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Quicksearch</OrganizationName>
-    <OrganizationName xml:lang="en">Quicksearch</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Quick search Sweden AB</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Quick search Sweden AB</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.quicksearch.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://en.quicksearch.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <EmailAddress>mailto:info@quicksearch.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <EmailAddress>mailto:info@quicksearch.se</EmailAddress>
-  </ContactPerson>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Quicksearch Feedback solutions</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Quicksearch Feedback solutions</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Quicksearch Feedback solutions for HR surveys.</mdui:Description>
+        <mdui:Description xml:lang="en">Quicksearch Feedback solutions för HR-undersökningar</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.quicksearch.se/hem/om-oss/personuppgiftspolicy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGnDCCBYSgAwIBAgIMLUQQnefHcE9BN5M4MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxODAeFw0yMjAxMTIxMDExMjlaFw0yMzAyMTMxMDExMjlaMG0xCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdIYWxsYW5kMREwDwYDVQQHDAhIYWxtc3RhZDEeMBwGA1UECgwVUXVpY2tzZWFyY2ggU3dlZGVuIEFCMRkwFwYDVQQDDBAqLnF1aWNrc2VhcmNoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCqSVIBBFR3LsPpQ55mVCnCWj9Hmxdx2Qo5Awx79v50VHdAFfef5Cx3/Yj+U3SGU1u+HSJLtKbkPTZaY8H8AMb/lOtHH8ajBqF1ZFLCXgkW9qIRuABb+guvb3HExLyAKk8SjRl7x/Bhy0u0FBZHUbUT8BoXFRH7f4avGXZ4vbZX+hqdVKv2JFqG4KsQQv7KxSuCtcuUzOpECkw7f85Ie/ZDPtKSVMIsEXFAH3MTep/CJFoJJ4q/Pr1HFRaPW8euhXHBT7qii7B2zMG2tgLwtM4OMFOkKlQxdbob7GxTQ89g86vRVgrAS+SD+H2L//OG+GY68+/pQSveyrs4lLLG/xQIDAQABo4IDVzCCA1MwDgYDVR0PAQH/BAQDAgWgMIGOBggrBgEFBQcBAQSBgTB/MEQGCCsGAQUFBzAChjhodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc3JzYW92c3NsY2EyMDE4LmNydDA3BggrBgEFBQcwAYYraHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3Nyc2FvdnNzbGNhMjAxODBWBgNVHSAETzBNMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAIBgZngQwBAgIwCQYDVR0TBAIwADA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzcnNhb3Zzc2xjYTIwMTguY3JsMCsGA1UdEQQkMCKCECoucXVpY2tzZWFyY2guc2WCDnF1aWNrc2VhcmNoLnNlMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT473/yzXhnqN5vjySNiPGHAwKz6zAdBgNVHQ4EFgQUUjzFqjl5RmmU2JejpbwKF08vNDkwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB1AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABfk3Fd4YAAAQDAEYwRAIgAvmUhktndi+QegG9T5TskY2lMmARymjlgRxmvGEghUkCIFpu8ZRVOtvE8LUDRt0elt2TZ7r2B2jt6s0FuvTkAsVFAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF+TcV2cAAABAMARzBFAiEAvc1k+DDlchjxVzqw9moGgLJtqATm7oVxHNJgldGqHIwCIGhlfV+uobLsduhtaT4BMKHDJRFUczKMpp6rQroK/ZPnAHcANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+TcV3VAAABAMASDBGAiEAtsHXKDhDrqZj08uu6p90/rvgrjRILyIdgGlfHx1f2iECIQDg26MCmOQeAvQTRFqfHN2eKNgvD7K2Dj5a6n3zKDP5bjANBgkqhkiG9w0BAQsFAAOCAQEABNZP0v917f8ZxLwdFrk23lq2Lru0pNWf1raqvy5/sKjQJO4zEbZwq1g1/P9u9QY2cxmj0Q+iEiJMILP2B8nA2HUbM70NHvs7f2tMkfWhsulZy9f5I2jJ3c+Vz8LhjQXIIsXIAURPmgtxC1m4uQEfxCinsyktlWNNIEwFnHBQesn/tb5BVyLGGaFPtmFN4Yx+hDE5DD2EREbsZLCienCPaJQgmifrrGrGlstOc6EM1YaZMyvXGPUZ1GEVtBG9uC8fFsjLIKHcqT8v03f0qmVFKejSWdW6uPS2eC1ca+s8JkFUhZBGDJvkoN7q+HU/JwShBilvr+DFRQLB5tzdGGqbrQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.quicksearch.se/AuthServices/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.quicksearch.se/AuthServices/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.quicksearch.se/AuthServices/Acs" isDefault="false" index="1"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">quicksearch.se</md:ServiceName>
+      <md:RequestedAttribute Name="Minimal"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Quicksearch</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Quicksearch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Quick search Sweden AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Quick search Sweden AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.quicksearch.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://en.quicksearch.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:info@quicksearch.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:info@quicksearch.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml b/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
index d59e9beb..702189b6 100644
--- a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
@@ -5,68 +5,68 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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://login.temp1235.hhs.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.temp1235.hhs.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://login.temp1235.hhs.se/adfs/services/trust">
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.temp1235.hhs.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://www.hhs.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>IT</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
-    <TelephoneNumber>+46 8 7369400</TelephoneNumber>
-  </ContactPerson>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.temp1235.hhs.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://login.temp1235.hhs.se/adfs/services/trust">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.temp1235.hhs.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 7369400</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml b/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml
index 265262dd..1bfdd896 100644
--- a/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.tst.ki.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.tst.ki.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Karolinska Institutet (test Shibboleth 3)</mdui:DisplayName>
@@ -36,8 +36,8 @@
         <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -61,8 +61,8 @@ n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -86,8 +86,8 @@ MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -111,20 +111,20 @@ jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tst.ki.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tst.ki.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -148,8 +148,8 @@ n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -173,8 +173,8 @@ MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -198,8 +198,8 @@ jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
index 2df7a976..474c715e 100644
--- a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
@@ -5,23 +5,22 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login2.temp1235.hhs.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login2.temp1235.hhs.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</mdui:DisplayName>
         <mdui:Description xml:lang="en">For testing only</mdui:Description>
         <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Endast TEST</mdui:Description>
-        <!--            <mdui:Logo height="80" width="80">https://login2.temp1235.hhs.se/Path/To/Logo.png</mdui:Logo> -->
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -46,8 +45,8 @@ B90rsNE83YT8g731/6Y6sLC841F5HGNO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -72,8 +71,8 @@ dKJkzuygfKebul7JLITyh1taLtz86Wrq
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -98,19 +97,19 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login2.temp1235.hhs.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login2.temp1235.hhs.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -135,8 +134,8 @@ B90rsNE83YT8g731/6Y6sLC841F5HGNO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -161,8 +160,8 @@ dKJkzuygfKebul7JLITyh1taLtz86Wrq
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -187,23 +186,21 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Stockholm School of Economics</OrganizationName>
-    <OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.hhs.se</OrganizationURL>
-    <OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <EmailAddress>mailto:gregor.borgstrand@hhs.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.hhs.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:gregor.borgstrand@hhs.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml b/swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml
index 23e89843..c1ca7005 100644
--- a/swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml
@@ -5,21 +5,21 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://ls00002.ad.mah.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://ls00002.ad.mah.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ad.mah.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Malmö Högskolan Shib 3 Test IdP ls00002.ad.mah.se</mdui:DisplayName>
         <mdui:Description xml:lang="en">Malmö University Shib 3 Test IdP ls00002.ad.mah.se</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -44,8 +44,8 @@ JV2n
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -70,8 +70,8 @@ CeM5ag==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -96,25 +96,20 @@ qGXOyg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ls00002.ad.mah.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ls00002.ad.mah.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ad.mah.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -139,8 +134,8 @@ JV2n
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -165,8 +160,8 @@ CeM5ag==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -191,9 +186,7 @@ qGXOyg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/lu.beta.instructure.com-saml2.xml b/swamid-2.0/lu.beta.instructure.com-saml2.xml
index 0d50ad8a..92765109 100644
--- a/swamid-2.0/lu.beta.instructure.com-saml2.xml
+++ b/swamid-2.0/lu.beta.instructure.com-saml2.xml
@@ -22,9 +22,9 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -46,17 +46,17 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -78,14 +78,14 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
 IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
@@ -107,17 +107,17 @@ BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
 XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
 1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
 Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
 IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
@@ -139,9 +139,9 @@ BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
 XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
 1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
 Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://lu.beta.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://lu.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
diff --git a/swamid-2.0/lu.test.instructure.com-saml2.xml b/swamid-2.0/lu.test.instructure.com-saml2.xml
index 51534edf..2454de54 100644
--- a/swamid-2.0/lu.test.instructure.com-saml2.xml
+++ b/swamid-2.0/lu.test.instructure.com-saml2.xml
@@ -22,9 +22,9 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -46,17 +46,17 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -78,14 +78,14 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
 IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
@@ -107,17 +107,17 @@ BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
 XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
 1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
 Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
 IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
@@ -139,9 +139,9 @@ BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
 XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
 1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
 Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://lu.test.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://lu.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
diff --git a/swamid-2.0/ludwig.lub.lu.se-sp.xml b/swamid-2.0/ludwig.lub.lu.se-sp.xml
index 8dbada82..19e95d0f 100644
--- a/swamid-2.0/ludwig.lub.lu.se-sp.xml
+++ b/swamid-2.0/ludwig.lub.lu.se-sp.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- EntityDescriptor requires an "entityID" attribute. -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ludwig.lub.lu.se/sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-12-17T22:11:33Z">
diff --git a/swamid-2.0/mds.lan.kth.se-shibboleth.xml b/swamid-2.0/mds.lan.kth.se-shibboleth.xml
index c7141483..faaa8542 100644
--- a/swamid-2.0/mds.lan.kth.se-shibboleth.xml
+++ b/swamid-2.0/mds.lan.kth.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://mds.lan.kth.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mds.lan.kth.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/mds.sunet.se-shibboleth.xml b/swamid-2.0/mds.sunet.se-shibboleth.xml
index 548d6a06..c2c68abd 100644
--- a/swamid-2.0/mds.sunet.se-shibboleth.xml
+++ b/swamid-2.0/mds.sunet.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://mds.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mds.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
index 2a1e8825..a05aaea0 100644
--- a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
+++ b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
@@ -13,7 +13,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://meetingtools.nordu.net/Shibboleth.sso/DS/idp.nordu.net" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meetingtools.nordu.net/Shibboleth.sso/DS/idp.nordu.net" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/mfa-check.swamid.se-shibboleth.xml b/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
index 17a9e0b1..40da4f65 100644
--- a/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mfa-check.swamid.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-03-19T17:31:59Z">
diff --git a/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml b/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
index 0531498d..98710802 100644
--- a/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mfa.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, MFA tests-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
index 5ef03996..9091dfa1 100644
--- a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
@@ -23,9 +23,6 @@
         <mdui:Description xml:lang="sv">IDP för test på Mittuniversitetet</mdui:Description>
         <mdui:DisplayName xml:lang="en">Mid Sweden University (test)</mdui:DisplayName>
         <mdui:Description xml:lang="en">IDP for testing at Mid Sweden University</mdui:Description>
-        <!--
-                <mdui:Logo height="80" width="80">https://miunidptest.miun.se/Path/To/Logo.png</mdui:Logo>
--->
         <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
         <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
@@ -122,11 +119,6 @@ YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidptest.miun.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidptest.miun.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://miunidptest.miun.se/idp/profile/Shibboleth/SSO"/>
@@ -216,8 +208,6 @@ YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
diff --git a/swamid-2.0/moodle.media.nordu.net-.xml b/swamid-2.0/moodle.media.nordu.net-.xml
index 022c7048..0c8444bb 100644
--- a/swamid-2.0/moodle.media.nordu.net-.xml
+++ b/swamid-2.0/moodle.media.nordu.net-.xml
@@ -5,10 +5,10 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
diff --git a/swamid-2.0/my.ilabsolutions.com.xml b/swamid-2.0/my.ilabsolutions.com.xml
index ff8e8603..fe512d47 100644
--- a/swamid-2.0/my.ilabsolutions.com.xml
+++ b/swamid-2.0/my.ilabsolutions.com.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">iLab Solutions</mdui:DisplayName>
@@ -49,27 +49,27 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu.ilab.agilent.com/account/saml/swamid" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://karolinska.corefacilities.org/account/saml/swamid" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lund.ilab.agilent.com/account/saml/swamid" index="5"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">iLab Solutions</ServiceName>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">ILab Solutions, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ILab Solutions, LLC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>ID Integration support</GivenName>
-    <EmailAddress>mailto:integrations_id@ilabsolutions.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:ilab-support@agilent.com</EmailAddress>
-  </ContactPerson>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">iLab Solutions</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ILab Solutions, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ILab Solutions, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ID Integration support</md:GivenName>
+    <md:EmailAddress>mailto:integrations_id@ilabsolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:ilab-support@agilent.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml b/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml
index a3a78bff..44ad13a6 100644
--- a/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml
+++ b/swamid-2.0/nagios-vm.nordu.net-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://nagios-vm.nordu.net/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios-vm.nordu.net/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/nagios.nordu.net-8087-sp.xml b/swamid-2.0/nagios.nordu.net-8087-sp.xml
index 7f7d776f..469ee18c 100644
--- a/swamid-2.0/nagios.nordu.net-8087-sp.xml
+++ b/swamid-2.0/nagios.nordu.net-8087-sp.xml
@@ -5,39 +5,39 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
 WrvKMXfnKt9z7TD7QzsbJFl6UdFDpIesx7UY/pgKE6JYlmOshNtaB5W9y/IP3Hm0
 05FYLYrP3UqHcGTiJ8ULRjH+Vg/eNXZk9aCUgk4f4DBbQGLo6QXWncwKW2CoCtwR
 L//g2DOX1RMVDqJrDQsUvXZjojS1wQ7W3SOLah0Ycc2MEzcRzxotr8dCtgAR/fuf
 sxhZOYN3amGvXw4JBdVC7yaw+HclZNjgQhy+9wzpn8+V+Rx2mJv5CPNVa9oDMi2S
 1MU0QotxufXqUNqZwiQqtYaalWS6my+8iRZs+RMLZFLtXTqEbDWR8+6NJdVXktYe
 xwIDAQAB
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
 WrvKMXfnKt9z7TD7QzsbJFl6UdFDpIesx7UY/pgKE6JYlmOshNtaB5W9y/IP3Hm0
 05FYLYrP3UqHcGTiJ8ULRjH+Vg/eNXZk9aCUgk4f4DBbQGLo6QXWncwKW2CoCtwR
 L//g2DOX1RMVDqJrDQsUvXZjojS1wQ7W3SOLah0Ycc2MEzcRzxotr8dCtgAR/fuf
 sxhZOYN3amGvXw4JBdVC7yaw+HclZNjgQhy+9wzpn8+V+Rx2mJv5CPNVa9oDMi2S
 1MU0QotxufXqUNqZwiQqtYaalWS6my+8iRZs+RMLZFLtXTqEbDWR8+6NJdVXktYe
 xwIDAQAB
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.nordu.net:8087/acs/redirect" index="2"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.nordu.net:8087/acs/artifact" index="3"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.nordu.net:8087/ecp" index="4"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087" index="5"/>
-  </ns0:SPSSODescriptor>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.nordu.net:8087/acs/redirect" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.nordu.net:8087/acs/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.nordu.net:8087/ecp" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087" index="5"/>
+  </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/nagios.nordu.net-shibboleth.xml b/swamid-2.0/nagios.nordu.net-shibboleth.xml
index ee2dddb2..15a8beac 100644
--- a/swamid-2.0/nagios.nordu.net-shibboleth.xml
+++ b/swamid-2.0/nagios.nordu.net-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://nagios.nordu.net/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nagios.nordu.net/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml b/swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
index 1d193799..2a187d4f 100644
--- a/swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
+++ b/swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
@@ -10,20 +10,20 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nextcloud.fysik.su.se/swamidproxy/disco" index="1"/>
-      <ns2:UIInfo xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui">
-        <ns2:DisplayName xml:lang="en">Fysikum Nextcloud</ns2:DisplayName>
-        <ns2:Description xml:lang="en">Fysikum Nextcloud</ns2:Description>
-        <ns2:InformationURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/nextcloud-storage-backup</ns2:InformationURL>
-        <ns2:PrivacyStatementURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/nextcloud-storage-backup</ns2:PrivacyStatementURL>
-      </ns2:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIDITCCAgmgAwIBAgIULOMzxx3eC1JPmsnSkAiDyv8BV40wDQYJKoZIhvcNAQEL
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nextcloud.fysik.su.se/swamidproxy/disco" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Fysikum Nextcloud</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Fysikum Nextcloud</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/nextcloud-storage-backup</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.fysik.su.se/english/staff/it-and-telephony/nextcloud-storage-backup</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIULOMzxx3eC1JPmsnSkAiDyv8BV40wDQYJKoZIhvcNAQEL
 BQAwIDEeMBwGA1UEAwwVbmV4dGNsb3VkLmZ5c2lrLnN1LnNlMB4XDTE5MTEwNDA4
 NTIxMFoXDTI5MTEwMTA4NTIxMFowIDEeMBwGA1UEAwwVbmV4dGNsb3VkLmZ5c2lr
 LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4b5SfEBujPbm
@@ -40,14 +40,14 @@ n34gM6hYC13gs4hlCjNyxo0ABwb3BrHLdUp3851YRfBKYa5IcPqnQz96Th+OkUnQ
 xGQuNFs58JjHcdc0MsnCE5urIPo5np5Z8k/2f4h1M49iNYtfz8gdhqaWGBLtY1IF
 dwfO9Ln4KIh7foGimbAF2y7ekk7Wl4suyyFDBfcGLOdACk/9rog/YMvkv8jXKyg5
 sE6WTDYtmjbeP1uUWRiDjM1LChB3r+JC18BYVVpXXzF6opaiEw==
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIID5DCCAkygAwIBAgIUTo+7ru5RRb7n0UwBzVP/naj8dJUwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID5DCCAkygAwIBAgIUTo+7ru5RRb7n0UwBzVP/naj8dJUwDQYJKoZIhvcNAQEL
 BQAwETEPMA0GA1UEAxMGbGFwdG9yMB4XDTIwMTAxOTIwMTAyNloXDTMwMTAxNzIw
 MTAyNlowETEPMA0GA1UEAxMGbGFwdG9yMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A
 MIIBigKCAYEAsxFQyn+LOE53TgAjeTrYp08HB7rynUWn4an4fGyNIRmy6ePxQLzo
@@ -68,25 +68,25 @@ hlDdvgrL5oC4FooDRHhsgWZcZGr571CpNfAcMlPn7ZA/GoN+aUKAIfmP6Jtzo9JW
 dMoXJHtQtBWO+heairETbNW0vCaeXaij6bRqnM6XbQMD8k1iN2NtdEnT5D+g/ce/
 QttmrlLeSQIypcO15eEesYK/no3Gm1CEy0G5jwwajDN4JApjEIpdd0SkUVnCJkWV
 ZvXfxWm8pZrfPFiZV0nY3FZ8Qwz/T1Ne4pdqZV7vR1Wbgetamv0ocA==
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcloud.fysik.su.se/swamidproxy/acs/post" index="1"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">Fysikum</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">Fysikum</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://fysik.su.se/english</ns0:OrganizationURL>
-    <ns0:OrganizationURL xml:lang="sv">https://fysik.su.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Alex Kastanas</ns0:GivenName>
-    <ns0:EmailAddress>mailto:kastanas@fysik.su.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>IT Support at Fysikum</ns0:GivenName>
-    <ns0:EmailAddress>mailto:dsa@fysik.su.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcloud.fysik.su.se/swamidproxy/acs/post" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Fysikum</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Fysikum</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://fysik.su.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://fysik.su.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex Kastanas</md:GivenName>
+    <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support at Fysikum</md:GivenName>
+    <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ni.nordu.net-shibboleth.xml b/swamid-2.0/ni.nordu.net-shibboleth.xml
index 0f0411a5..b7375128 100644
--- a/swamid-2.0/ni.nordu.net-shibboleth.xml
+++ b/swamid-2.0/ni.nordu.net-shibboleth.xml
@@ -7,9 +7,9 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://ni.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://ni.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
-      <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://ni.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ni.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ni.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ni.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml b/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
index 13bf23fc..ad65c02e 100644
--- a/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://noec.release-check.swamid.se/shibboleth">
-  <!-- Test with SP without any EC -->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/nya-00.its.umu.se-aws-idp.xml b/swamid-2.0/nya-00.its.umu.se-aws-idp.xml
index 7e407b86..23702110 100644
--- a/swamid-2.0/nya-00.its.umu.se-aws-idp.xml
+++ b/swamid-2.0/nya-00.its.umu.se-aws-idp.xml
@@ -4,19 +4,19 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-04T13:59:17Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://nya-00.its.umu.se/aws-idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://nya-00.its.umu.se/aws-idp">
     <md:Extensions>
       <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -66,7 +66,7 @@ MIIDCzCCAfOgAwIBAgIJAMOqLrsG9SMvMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMMEW55YS0wMC5p
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <md:Organization>
     <md:OrganizationName xml:lang="sv">UmU-ITS-NyA-dev</md:OrganizationName>
     <md:OrganizationName xml:lang="en">UmU-ITS-NyA-dev</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">ITS, it-stod-och-systemutveckling</md:OrganizationDisplayName>
@@ -74,7 +74,7 @@ MIIDCzCCAfOgAwIBAgIJAMOqLrsG9SMvMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMMEW55YS0wMC5p
     <md:OrganizationURL xml:lang="sv">https://www.umu.se/it-stod-och-systemutveckling/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/ict-services-and-system-development/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  <md:ContactPerson contactType="administrative">
     <md:Company>Umea University</md:Company>
     <md:SurName>Mikael Lindmark</md:SurName>
     <md:EmailAddress>mailto:mikael.lindmark@umu.se</md:EmailAddress>
diff --git a/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml b/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
index d6561aae..4a2c89c6 100644
--- a/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://nya-gerrit.its.umu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-12-16T10:10:43Z">
diff --git a/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml b/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml
index f5b8d3b4..147a9158 100644
--- a/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml
+++ b/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml
@@ -123,12 +123,12 @@ LsSHnw5iDlrctxuIKBTKUp1TBf3/eA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyaanvandarstod.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyaanvandarstod.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Universitets- och hogskoleradet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitets- och hogskoleradet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Jimmy</md:GivenName>
     <md:SurName>Jakobsson</md:SurName>
diff --git a/swamid-2.0/openarchive.ki.se-shibboleth.xml b/swamid-2.0/openarchive.ki.se-shibboleth.xml
index 1a37e4ef..31f5940d 100644
--- a/swamid-2.0/openarchive.ki.se-shibboleth.xml
+++ b/swamid-2.0/openarchive.ki.se-shibboleth.xml
@@ -108,7 +108,7 @@ ryntMn54coBlF2Vqrm4Fa2XUyUIkurCv3FZtdN5W
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openarchive.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openarchive.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <md:Organization>
     <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
diff --git a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml b/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
index 904d836d..c3fa423d 100644
--- a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
@@ -4,36 +4,36 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-01T15:58:53Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <ns3:DiscoveryResponse xmlns:ns3="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Sunets Outscan proxy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Sunet Outscan proxy</mdui:DisplayName>
@@ -47,10 +47,10 @@
         <mdui:Logo xml:lang="sv" height="128" width="128">https://wiki.sunet.se/favicon-128-128.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUZ1Oow1fKz7Ch5AuZjSzGYxbzkXQwDQYJKoZIhvcNAQEL
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUZ1Oow1fKz7Ch5AuZjSzGYxbzkXQwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjExMTAxMTQ0NzM2WhcN
 MzExMDMwMTQ0NzM2WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ0vwZGstFedFgG1CbcU/wyv9i1BUeZb
@@ -78,14 +78,14 @@ plhjwuYy0LIBc4RBiw6xJIiuqmi5yjxiWqkQ/08imkWFcU4AinqrGu6qvNOY3SJt
 wJ00lTnZAj3RWRamQK26iShY+sFVrnsHuQgs29ov+L0gkKaM3efowD/6zUwbgmZs
 w5T3xuyviMVSu3BBZcA0YdGGtuvSSU+mj5UkeJO6DgBcNiOxAdxAFk5g1wjlGffp
 TkzG7ocEUA==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUZ1Oow1fKz7Ch5AuZjSzGYxbzkXQwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUZ1Oow1fKz7Ch5AuZjSzGYxbzkXQwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjExMTAxMTQ0NzM2WhcN
 MzExMDMwMTQ0NzM2WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ0vwZGstFedFgG1CbcU/wyv9i1BUeZb
@@ -113,19 +113,19 @@ plhjwuYy0LIBc4RBiw6xJIiuqmi5yjxiWqkQ/08imkWFcU4AinqrGu6qvNOY3SJt
 wJ00lTnZAj3RWRamQK26iShY+sFVrnsHuQgs29ov+L0gkKaM3efowD/6zUwbgmZs
 w5T3xuyviMVSu3BBZcA0YdGGtuvSSU+mj5UkeJO6DgBcNiOxAdxAFk5g1wjlGffp
 TkzG7ocEUA==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
-    <ns0:AttributeConsumingService index="1">
-      <ns0:ServiceName xml:lang="en">Sunet Outscan proxy</ns0:ServiceName>
-      <ns0:ServiceName xml:lang="sv">Sunet Outscan proxy</ns0:ServiceName>
-      <ns0: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"/>
-    </ns0:AttributeConsumingService>
-  </ns0:SPSSODescriptor>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://outscan-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Sunet Outscan proxy</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Sunet Outscan proxy</md:ServiceName>
+      <md: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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Sunet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
diff --git a/swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml b/swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml
index 3161f96f..ec6f7c16 100644
--- a/swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml
+++ b/swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml
@@ -75,14 +75,14 @@ t7UDvo/rNGhaFXkPRKjjLwxirYt6UTHWXBLubiNhC9TUo+Icln2cfWLARSnorHhK0ePx0uC8Zz+0
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://outscan.outpost24.com/opi/XMLAPI?ACTION=SAMLRESPONSE" index="0"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Outpost24</OrganizationName>
-    <OrganizationName xml:lang="sv">Outpost24</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Outscan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Outscan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://outpost24.com</OrganizationURL>
-    <OrganizationURL xml:lang="sv">https://outpost24.com</OrganizationURL>
-  </Organization>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Outpost24</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Outpost24</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Outscan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Outscan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://outpost24.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://outpost24.com</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>Fredrik Pettai</md:SurName>
     <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
diff --git a/swamid-2.0/permitwinstaging1.caleaccess.com.xml b/swamid-2.0/permitwinstaging1.caleaccess.com.xml
index 09ed0be8..fd35829d 100644
--- a/swamid-2.0/permitwinstaging1.caleaccess.com.xml
+++ b/swamid-2.0/permitwinstaging1.caleaccess.com.xml
@@ -21,9 +21,9 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml b/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
index 1e127be5..fb7a8f5c 100644
--- a/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://personalized.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = https://refeds.org/category/personalized-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/play.mdh.se.xml b/swamid-2.0/play.mdh.se.xml
index 4a1e0dea..720b8a12 100644
--- a/swamid-2.0/play.mdh.se.xml
+++ b/swamid-2.0/play.mdh.se.xml
@@ -44,18 +44,18 @@
     <md:OrganizationDisplayName xml:lang="en">Mälardalens Högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.mdh.se</md:OrganizationURL>
   </md:Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Henrik</GivenName>
-    <SurName>Springare</SurName>
-    <EmailAddress>mailto:henrik.springare@mdh.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Falck</SurName>
-    <EmailAddress>mailto:peter.falck@mdh.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@mdh.se</EmailAddress>
-  </ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Henrik</md:GivenName>
+    <md:SurName>Springare</md:SurName>
+    <md:EmailAddress>mailto:henrik.springare@mdh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Falck</md:SurName>
+    <md:EmailAddress>mailto:peter.falck@mdh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@mdh.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/prep.math.su.se-shibboleth.xml b/swamid-2.0/prep.math.su.se-shibboleth.xml
index 96a961ba..37e9d79c 100644
--- a/swamid-2.0/prep.math.su.se-shibboleth.xml
+++ b/swamid-2.0/prep.math.su.se-shibboleth.xml
@@ -143,8 +143,6 @@ CbhpbqNPsz3I/+a1r4ELhjSDig==
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <!-- ORGANIZATION INFO -->
-  <!-- CONTACTS -->
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SU, Matematiska institutionen</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SU, Department of Mathematics </md:OrganizationName>
diff --git a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
index c18ec007..3afb324d 100644
--- a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
@@ -20,10 +20,10 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml b/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
index 97f9ae45..8df42092 100644
--- a/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://pseudonymous.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = https://refeds.org/category/pseudonymous-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml b/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
index 8e0fe93d..182f8e82 100644
--- a/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://pubtestnew.kib.ki.se/shibboleth">
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml b/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
index 9cfc3255..61800aa2 100644
--- a/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rands.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Research and Scholarship-->
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
index 9fbcdb3b..85d816f5 100644
--- a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
+++ b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
@@ -5,11 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://referens-idp.skolfederation.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://referens-idp.skolfederation.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -35,21 +35,21 @@ l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://referens-idp.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://referens-idp.skolfederation.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -75,19 +75,19 @@ l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">ReferensIdP</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Skolfederation.SE Referens-IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://skolfederation.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>SUNET</Company>
-    <EmailAddress>mailto:operations@skolfederation.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ReferensIdP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Skolfederation.SE Referens-IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://skolfederation.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SUNET</md:Company>
+    <md:EmailAddress>mailto:operations@skolfederation.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/rems.csc.fi.xml b/swamid-2.0/rems.csc.fi.xml
index 7e7f9041..c6d82eb3 100644
--- a/swamid-2.0/rems.csc.fi.xml
+++ b/swamid-2.0/rems.csc.fi.xml
@@ -11,8 +11,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rems.csc.fi/Shibboleth.sso/Login" index="1"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rems.csc.fi/Shibboleth.sso/Login2" index="2"/>
       <mdui:UIInfo>
@@ -24,8 +24,8 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://rems.csc.fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://rems.csc.fi/web/guest/tietosuojaseloste</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJAJNkHpbnqskZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
@@ -46,45 +46,45 @@
                         c3E0G+pYuKCVKHVH6HOcuVL23IneYlhKtmz+Kw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://rems.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">REMS</ServiceName>
-      <ServiceName xml:lang="en">REMS</ServiceName>
-      <ServiceDescription xml:lang="fi">Valtuutuuksien Hallinta
-                Jarjestelma</ServiceDescription>
-      <ServiceDescription xml:lang="en">Resource Entitlement Management
-                System</ServiceDescription>
-      <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="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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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 - IT-centret för vetenskap</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 - IT-centret för vetenskap</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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Janne</GivenName>
-    <SurName>Lauros</SurName>
-    <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Janne</GivenName>
-    <SurName>Lauros</SurName>
-    <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rems.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">REMS</md:ServiceName>
+      <md:ServiceName xml:lang="en">REMS</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Valtuutuuksien Hallinta
+                Jarjestelma</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Resource Entitlement Management
+                System</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md: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"/>
+      <md: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"/>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md: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"/>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - IT-centret för vetenskap</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - IT-centret för vetenskap</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Lauros</md:SurName>
+    <md:EmailAddress>mailto:janne.lauros@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Lauros</md:SurName>
+    <md:EmailAddress>mailto:janne.lauros@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/rt-test.sunet.se-shibboleth.xml b/swamid-2.0/rt-test.sunet.se-shibboleth.xml
index a29ba0a0..deab2766 100644
--- a/swamid-2.0/rt-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/rt-test.sunet.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rt-test.sunet.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-29T15:36:08Z">
diff --git a/swamid-2.0/rt.sunet.se-shibboleth.xml b/swamid-2.0/rt.sunet.se-shibboleth.xml
index 7b222812..6e203a3a 100644
--- a/swamid-2.0/rt.sunet.se-shibboleth.xml
+++ b/swamid-2.0/rt.sunet.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rt.sunet.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-02-09T13:58:38Z">
diff --git a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
index 9da78632..fe7687b1 100644
--- a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
@@ -11,14 +11,14 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://s2s.ifmsa.se/Saml2/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIDZDCCAkwCCQC/CkAr6rf3djANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJT
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://s2s.ifmsa.se/Saml2/disco" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDZDCCAkwCCQC/CkAr6rf3djANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJT
 RTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNV
 BAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEHMycy5jbG91
 ZGFwcC5uZXQwHhcNMTcwOTE2MjMwMTQ0WhcNMjcwOTE0MjMwMTQ0WjB0MQswCQYD
@@ -37,25 +37,25 @@ dwQ0t8n66d+IXLLvg2KtyWJjfycEgsbrV76b6L71t+iTbFh/ZsfvmEePYJlwOZ7q
 l88ZeHMBKnOdDANm1jTZTD2DjpwjO2Qy4Ng8gIXQola1O/gG/LaLfu7Fxk/8T9TE
 r5EPe+L5117kzDaDZtqV6H4q24B2mhguRNUCN2ZkonPPEvkhdgcokV7qffRDkwXu
 zJkE6G+EYWU=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.ifmsa.se/Saml2/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.ifmsa.se/Saml2/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">IFMSA-Sweden</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://www.ifmsa.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Admin</ns0:GivenName>
-    <ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Admin</ns0:GivenName>
-    <ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.ifmsa.se/Saml2/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.ifmsa.se/Saml2/acs/redirect" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.ifmsa.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Admin</md:GivenName>
+    <md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Admin</md:GivenName>
+    <md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/samsok.libris.kb.se-shibboleth.xml b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
index 4cb56fcb..89e0d441 100644
--- a/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
+++ b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
@@ -5,25 +5,25 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIB5TCCAU6gAwIBAgIJAKMZgDG7eScnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3NhbXNvay5saWJyaXMua2Iuc2UwHhcNMDcxMTA3MDk0MzI5WhcNMDgxMTA2MDk0MzI5WjAeMRwwGgYDVQQDExNzYW1zb2subGlicmlzLmtiLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCydaK46C816+A1I6Ykb9AvLf0rfYlhFT6vMe0a3DM7A0HovsWl8HThJwQNTGSDowty1svAlRgBU5gQKuCA9ruc7XZi7pn0vuVgtayVvkoh9adN/8QVFvz2KY0uux7M2ewyQ+R2PA/w58LJa996RQlcHeDAdQFfg87nUFQEZauy5QIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAHFDEp8qHZKfS1RQDYvG/pYJZ/0PHRcoDK5J2GGpQ4/SIsJBbtF/2uWLVfywNDYIP7DruWxHUOLaNE6ovJ9S1+RGi8iix8I44/Nh0EjyyQqU8w8IoyDdzUUV9fBZ2BWz0JvFT4uBZDR2b3keXr2OlxYphbx3ikXpwZrVzWQq6mKm</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samsok.libris.kb.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Libris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Libris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Kungliga Biblioteket</Company>
-    <GivenName>Arvid</GivenName>
-    <SurName>Oja</SurName>
-    <EmailAddress>mailto:arvid.oja@kb.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samsok.libris.kb.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Libris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Libris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Kungliga Biblioteket</md:Company>
+    <md:GivenName>Arvid</md:GivenName>
+    <md:SurName>Oja</md:SurName>
+    <md:EmailAddress>mailto:arvid.oja@kb.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sd0312.sigma.dev-shibboleth.xml b/swamid-2.0/sd0312.sigma.dev-shibboleth.xml
index 7144c313..c61f676a 100644
--- a/swamid-2.0/sd0312.sigma.dev-shibboleth.xml
+++ b/swamid-2.0/sd0312.sigma.dev-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sd0312.sigma.dev/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-05-14T07:17:47Z">
diff --git a/swamid-2.0/sdauth.sciencedirect.com-.xml b/swamid-2.0/sdauth.sciencedirect.com-.xml
index d485ae32..cc73cd8f 100644
--- a/swamid-2.0/sdauth.sciencedirect.com-.xml
+++ b/swamid-2.0/sdauth.sciencedirect.com-.xml
@@ -25,7 +25,6 @@
         <mdui:Logo height="400" width="400">https://saml.elsevier.com/logos/elsevier-400x400.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://www.elsevier.com/about</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.elsevier.com/legal/privacy-policy</mdui:PrivacyStatementURL>
-        <!-- keyword strings are space-delimited. Spaces within individual keywords are encoded with a “plus” (+) character -->
         <mdui:Keywords xml:lang="en">Elsevier ScienceDirect Scopus ClinicalKey SciVal Reaxys Mendeley Embase Geofacets EngineeringVillage PharmaPendium</mdui:Keywords>
         <mdui:Logo xml:lang="en" height="400" width="400">https://saml.elsevier.com/logos/elsevier-400x400.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="158" width="158">https://saml.elsevier.com/logos/elsevier-158x158.png</mdui:Logo>
@@ -33,7 +32,6 @@
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <!--  Valid from Feb 05 2021 -->
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDTjCCAjYCCQDP0/owytd5/TANBgkqhkiG9w0BAQsFADBpMQswCQYDVQQGEwJV
@@ -58,13 +56,11 @@ HL0Y8cbWSCgsg/Qpi0kb19bSPNLxAB4SAfvYqQSnD8cZOA==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- auth.elsevier.com is our preferred end-point for AssertionConsumerService Binding, sdauth.sciencedirect.com and shibauth.elsevier.com are maintained for backward compatibility only -->
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibauth.elsevier.com/SHIRE/SAML2/POST" index="17"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibauth.elsevier.com/SHIRE/SAML/POST" index="18"/>
-    <!-- The following AssertionConsumerService Binding are for testing purposes only -->
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://certnx-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="15"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://certnx-shibauth-np.elsevier.com/SHIRE/SAML/POST" index="16"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadcq-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="19"/>
diff --git a/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml b/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
index 4f18762f..53c67c67 100644
--- a/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
+++ b/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://se-kau-shibboleth.moveon4.de/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-14T09:08:23Z">
diff --git a/swamid-2.0/secure.ouriginal.com.xml b/swamid-2.0/secure.ouriginal.com.xml
index 3f0d84ce..1676b5fe 100644
--- a/swamid-2.0/secure.ouriginal.com.xml
+++ b/swamid-2.0/secure.ouriginal.com.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/secure.port.se-shibboleth.xml b/swamid-2.0/secure.port.se-shibboleth.xml
index 16d3d805..0266a26d 100644
--- a/swamid-2.0/secure.port.se-shibboleth.xml
+++ b/swamid-2.0/secure.port.se-shibboleth.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Metadata KLARA chemical management system 2020-09-03 Ecoonline sweden AB
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://secure.port.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-10-16T15:40:27Z">
diff --git a/swamid-2.0/service4mobility.su.se-mobility_test.xml b/swamid-2.0/service4mobility.su.se-mobility_test.xml
index 6369febb..d255ce0e 100644
--- a/swamid-2.0/service4mobility.su.se-mobility_test.xml
+++ b/swamid-2.0/service4mobility.su.se-mobility_test.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
index 2e9007c8..e90dad84 100644
--- a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
@@ -5,16 +5,16 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-idp-test.oru.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-idp-test.oru.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">shib-idp-test.oru.se</mdui:DisplayName>
         <mdui:Description xml:lang="en">Test-IdP för Örebro universitet - Shibboleth IdP v3.2.1</mdui:Description>
         <mdui:Logo xml:lang="en" height="80" width="80">https://shib-idp-test.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -39,8 +39,8 @@ WVSpbBf+Iky5/3hSJbjO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -65,8 +65,8 @@ BAZNocu/Hh/kGS7R/8vneg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -91,25 +91,25 @@ d3hB7quCN72lcAz/8iZU
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -134,8 +134,8 @@ WVSpbBf+Iky5/3hSJbjO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -160,8 +160,8 @@ BAZNocu/Hh/kGS7R/8vneg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -186,12 +186,12 @@ d3hB7quCN72lcAz/8iZU
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Ehrnberg</SurName>
-    <EmailAddress>mailto:jonny.ehrnberg@oru.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonny</md:GivenName>
+    <md:SurName>Ehrnberg</md:SurName>
+    <md:EmailAddress>mailto:jonny.ehrnberg@oru.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml
index 4ae69da9..c1b7a96e 100644
--- a/swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-     This is example metadata only. Do *NOT* supply it as is without review,
-     and do *NOT* provide it in real time to your partners.
-
-     This metadata is not dynamic - it will not change as your configuration changes.
--->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib-test01.skolfederation.se/idp/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:07:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-test01.skolfederation.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-test01.skolfederation.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Test IdP 01 Skolfederation</mdui:DisplayName>
         <mdui:Description xml:lang="en">Test IdP 01 Skolfederation</mdui:Description>
-        <!--  <mdui:Logo height="80" width="80">https://shib-test01.skolfederation.se/Path/To/Logo.png</mdui:Logo> -->
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -46,8 +39,8 @@ SMNmbOs=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -73,8 +66,8 @@ oM6nOO8=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -100,25 +93,20 @@ ARYfhCs=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test01.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test01.skolfederation.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -144,8 +132,8 @@ SMNmbOs=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -171,8 +159,8 @@ oM6nOO8=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -198,9 +186,7 @@ ARYfhCs=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml
index fa29f780..2f72bf89 100644
--- a/swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml
@@ -5,15 +5,15 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-test02.skolfederation.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-test02.skolfederation.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Test IdP at shib-test02.skolfederation.se</mdui:DisplayName>
         <mdui:Description xml:lang="en">Test IdP at shib-test02.skolfederation.se</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -39,8 +39,8 @@ gYB1MC0=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -66,8 +66,8 @@ XOGjlaA=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -93,25 +93,20 @@ yD8jVf0=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test02.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test02.skolfederation.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -137,8 +132,8 @@ gYB1MC0=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -164,8 +159,8 @@ XOGjlaA=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -191,9 +186,7 @@ yD8jVf0=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml
index d2b680ed..ef409e28 100644
--- a/swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml
@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-     This is example metadata only. Do *NOT* supply it as is without review,
-     and do *NOT* provide it in real time to your partners.
-
-     This metadata is not dynamic - it will not change as your configuration changes.
--->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibbo3test.ltu.se/idp/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:20:10Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibbo3test.ltu.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibbo3test.ltu.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">A Name for the IdP at shibbo3test.ltu.se</mdui:DisplayName>
         <mdui:Description xml:lang="en">Enter a description of your IdP at shibbo3test.ltu.se</mdui:Description>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -44,8 +38,8 @@ seV/+5km6JE=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -70,8 +64,8 @@ DUfmSji9lFM=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -96,25 +90,20 @@ ynzkb00+6b8=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo3test.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo3test.ltu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -139,8 +128,8 @@ seV/+5km6JE=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -165,8 +154,8 @@ DUfmSji9lFM=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -191,9 +180,7 @@ ynzkb00+6b8=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
index 60ce6e7a..2931cbe1 100644
--- a/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml
@@ -5,14 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibboleth-test.uhr.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibboleth-test.uhr.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Universitets- och högskolerådet - Test</mdui:DisplayName>
@@ -29,9 +29,8 @@
         <mdui:IPHint>193.11.100.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.33760,18.05835</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -61,8 +60,8 @@ R1pR1C9aGOgVijhfxA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -92,8 +91,8 @@ m0LsY3AEmqhT8UG9og==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -123,19 +122,18 @@ l7UYcB93c7mgKbGO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-test.uhr.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" req-attr:supportsRequestedAttributes="true" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService xmlns:req-attr="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" req-attr:supportsRequestedAttributes="true" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-test.uhr.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-    </Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -165,8 +163,8 @@ R1pR1C9aGOgVijhfxA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -196,8 +194,8 @@ m0LsY3AEmqhT8UG9og==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -227,33 +225,31 @@ l7UYcB93c7mgKbGO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Universitets- och hogskoleradet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet - Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:hakan.pettersson@uhr.se</EmailAddress>
-    <TelephoneNumber>070-595 96 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:hakan.pettersson@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 70595 96 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:hakan.pettersson@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 70595 96 28</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitets- och hogskoleradet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet - Test</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>070-595 96 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70595 96 28</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>mailto:hakan.pettersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70595 96 28</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.ebscohost.com.xml b/swamid-2.0/shibboleth.ebscohost.com.xml
index 2794c88a..ab277d57 100644
--- a/swamid-2.0/shibboleth.ebscohost.com.xml
+++ b/swamid-2.0/shibboleth.ebscohost.com.xml
@@ -16,7 +16,6 @@
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <!-- This is the new cert as per SWAMID-116. Expires 10 March 2022 -->
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>New cert SWAMID-116</ds:KeyName>
@@ -60,7 +59,6 @@ g0Y=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- This is the cert that exists in the InCommon metadata. Good thru 22nd October 2022 -->
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>incommoncredsnew</ds:KeyName>
diff --git a/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml b/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
index 28e1c13d..e5e6fc21 100644
--- a/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
@@ -14,7 +14,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <!-- Serial No. 18031381922029708084, expires on Sun May 23 17:17:02 2021 GMT -->
           <ds:X509Certificate>
 			      MIIDXTCCAkWgAwIBAgIJAPo8VlLf+yM0MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 			      BAMTH3NoaWJib2xldGgubXNhY2FkZW1pY3ZlcmlmeS5jb20wHhcNMTYwNTI0MTcx
@@ -49,29 +48,29 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">Microsoft Academic Verification Engine</ServiceName>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Microsoft</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>AVE Support</GivenName>
-    <EmailAddress>mailto:avesupp@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Gaurav Kakodkar</GivenName>
-    <EmailAddress>mailto:gauraka@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>AVE Support</GivenName>
-    <EmailAddress>mailto:avesupp@microsoft.com</EmailAddress>
-  </ContactPerson>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Microsoft Academic Verification Engine</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md: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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Microsoft</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Microsoft</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AVE Support</md:GivenName>
+    <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gaurav Kakodkar</md:GivenName>
+    <md:EmailAddress>mailto:gauraka@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AVE Support</md:GivenName>
+    <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index 2494b253..056402f2 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -5,18 +5,18 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibboleth.uhr.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibboleth.uhr.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Universitets- och högskolerådet</mdui:DisplayName>
@@ -33,8 +33,8 @@
         <mdui:IPHint>193.11.100.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.33760,18.05835</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -60,22 +60,22 @@ UIW4Y6GzlL7EfXr31lnv
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhr.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uhr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhr.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uhr.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uhr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -101,35 +101,35 @@ UIW4Y6GzlL7EfXr31lnv
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Universitets- och hogskoleradet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Johan Andersson</SurName>
-    <EmailAddress>mailto:johan.andersson@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10-470 06 66</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Johan Andersson</SurName>
-    <EmailAddress>mailto:johan.andersson@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10-470 06 66</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>The Swedish Council for Higher Education</Company>
-    <SurName>Johan Andersson</SurName>
-    <EmailAddress>mailto:johan.andersson@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10-470 06 66</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitets- och hogskoleradet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Johan Andersson</md:SurName>
+    <md:EmailAddress>mailto:johan.andersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-470 06 66</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Johan Andersson</md:SurName>
+    <md:EmailAddress>mailto:johan.andersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-470 06 66</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Swedish Council for Higher Education</md:Company>
+    <md:SurName>Johan Andersson</md:SurName>
+    <md:EmailAddress>mailto:johan.andersson@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-470 06 66</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/signservice.edusign.sunet.se-sigservice.xml b/swamid-2.0/signservice.edusign.sunet.se-sigservice.xml
index 040ffe7b..69fc6af7 100644
--- a/swamid-2.0/signservice.edusign.sunet.se-sigservice.xml
+++ b/swamid-2.0/signservice.edusign.sunet.se-sigservice.xml
@@ -2,11 +2,11 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://signservice.edusign.sunet.se/sigservice">
   <md:Extensions>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-04-30T18:01:18Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
diff --git a/swamid-2.0/smultron.catalogix.se-8090-sp.xml b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
index 2d500843..66568035 100644
--- a/swamid-2.0/smultron.catalogix.se-8090-sp.xml
+++ b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
@@ -5,11 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:KeyDescriptor>
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
 BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
 EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
 MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
@@ -25,19 +25,19 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
 BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
 zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
 +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://smultron.catalogix.se:8090/" index="1"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://smultron.catalogix.se:8090/gembus.html</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Roland</ns0:GivenName>
-    <ns0:SurName>Hedberg</ns0:SurName>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://smultron.catalogix.se:8090/" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The GEMbus registry at Ladok</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The GEMbus registry at Ladok</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://smultron.catalogix.se:8090/gembus.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roland</md:GivenName>
+    <md:SurName>Hedberg</md:SurName>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sp.lhs.se-shibboleth.xml b/swamid-2.0/sp.lhs.se-shibboleth.xml
index 8f2126a3..7ac317ba 100644
--- a/swamid-2.0/sp.lhs.se-shibboleth.xml
+++ b/swamid-2.0/sp.lhs.se-shibboleth.xml
@@ -5,25 +5,25 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEFTCCA36gAwIBAgIKGij19wAAAAAAeTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRgwFgYDVQQKEw9MSFMgaSBTdG9ja2hvbG0xFTATBgNVBAsTDElULUF2ZGVsbmluZzEaMBgGA1UEAxMRZ3JlZW5wb2ludC5saHMuc2UwHhcNMDcxMTE1MTE0NjUxWhcNMTIxMTE1MTE1NjUxWjCBqjEcMBoGCSqGSIb3DQEJARYNc2VjQHJ0Lmxocy5zZTELMAkGA1UEBhMCU1cxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMSkwJwYDVQQKEyBTdG9ja2hvbG0gSW5zdGl0dXRlIG9mIEVkdWNhdGlvbjEWMBQGA1UECxMNSVQtZGVwYXJ0bWVudDESMBAGA1UEAxMJc3AubGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5OuqeuhMexhFh6i1Pm0vxvhDpFmJjm9Y6M1qa6Ug+vEoWZdCv5VQEh3A5kEEMtxi1QhxkcuQhtBoi+sKweDYEcMOlktzLnaSC0wMth/VLR7y2DP5oVzl1FjIlCZ0BdSf9bZENblHNpzb0/sCaVhW09vmp74/5AqV0jLt+XgVnmxVsUBDAgTzWK9fIoDLsClc1RQSUE8asIMiKVEH7KYMOcHRYIzp4Q2++iOvtvq8EVgWZvaDVzG7/CrqFRcuk/4naMyAOKXrGNNr7qB86yFy53Be43ZZjeJv0CQC9LaJZC2QsgbsG2OcCUHbTGEFOdl5DYVfEEVpU4s336WH/eARTQIDAQABo4HjMIHgMB0GA1UdDgQWBBTwtlrmSaEvXMNXT+kQj8ULsteJCTCBvgYDVR0jBIG2MIGzgBT/0okEYerF+Z8wLX763B0yh4G60qGBiKSBhTCBgjELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMRgwFgYDVQQKEw9MSFMgaSBTdG9ja2hvbG0xFTATBgNVBAsTDElULUF2ZGVsbmluZzEaMBgGA1UEAxMRZ3JlZW5wb2ludC5saHMuc2WCEEsrLPaG8gihTtyO+tjeJYcwDQYJKoZIhvcNAQEFBQADgYEAM4a5cBBOVKPXBLE6LKKrmExK2TtsOdw17EBL43RoG9IAH22mW1IY5vglf/zaYDm/WS4+8rvGJC+WP5QyMrHQQY52Z4iiSRhLs4ccbDoNR5EF3RxM9lb5tDprncT8d2VinlFztopWUQAmB6s447w+LzqXr62OKEgX3kzZvNSanZ4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">LHS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lärarhögskolan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lhs.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>LHS</Company>
-    <GivenName>Patrik</GivenName>
-    <SurName>Blomkvist</SurName>
-    <EmailAddress>mailto:patrik.blomkvist@lhs.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LHS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lärarhögskolan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lhs.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>LHS</md:Company>
+    <md:GivenName>Patrik</md:GivenName>
+    <md:SurName>Blomkvist</md:SurName>
+    <md:EmailAddress>mailto:patrik.blomkvist@lhs.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
index 96b67dc9..f6df5f70 100644
--- a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
+++ b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
@@ -5,11 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-2.0/sp.sprakochfolkminnen.se-.xml b/swamid-2.0/sp.sprakochfolkminnen.se-.xml
index 1f9f7548..4a3341f0 100644
--- a/swamid-2.0/sp.sprakochfolkminnen.se-.xml
+++ b/swamid-2.0/sp.sprakochfolkminnen.se-.xml
@@ -2,9 +2,9 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sp.sprakochfolkminnen.se/">
   <md:Extensions>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-03-02T14:07:24Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
diff --git a/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index 3cec6c87..9b93e19b 100644
--- a/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/sp.tools.sunet.se-shibboleth.xml b/swamid-2.0/sp.tools.sunet.se-shibboleth.xml
index fde4b2dc..62dc6311 100644
--- a/swamid-2.0/sp.tools.sunet.se-shibboleth.xml
+++ b/swamid-2.0/sp.tools.sunet.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://tools.sunet.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tools.sunet.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/sp.tshhosting.com-shibboleth.xml b/swamid-2.0/sp.tshhosting.com-shibboleth.xml
index 043b5731..7a9a187d 100644
--- a/swamid-2.0/sp.tshhosting.com-shibboleth.xml
+++ b/swamid-2.0/sp.tshhosting.com-shibboleth.xml
@@ -5,14 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledge.com/" index="1"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledge.com/" index="2"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin-router.webofknowledge.com/" index="3"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.incites.thomsonreuters.com/" index="4"/>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>shib.tshhosting.com</ds:KeyName>
         <ds:X509Data>
@@ -53,47 +53,47 @@
 						KAbjX00v9H9OhnG6wjffx0eNk6BzrQIvx2TmHju3fVMFtFA=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="5"/>
-    <AssertionConsumerService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cortellis.thomsonreuterslifesciences.com/ngg/sso/saml2/responseGateway.do" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cortellis.com/intelligence/sso/saml2/responseGateway.do" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.test-perf.clarivate.com/api/sso/saml2/authorize" index="51"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2&amp;auth=Shibboleth" index="111"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=PROF&amp;auth=Shibboleth" index="112"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2ESI&amp;auth=Shibboleth" index="113"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2JCR&amp;auth=Shibboleth" index="114"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2" index="115"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2ESI" index="116"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2JCR" index="117"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_PROF" index="118"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thomsoninnovation.com/tip-innovation/sso/saml2/idpresponse.do" index="127"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscriptions.techstreet.com/sso_sessions" index="130"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.derwentinnovation.com/tip-innovation/sso/saml2/idpresponse.do" index="131"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Clarivate Analytics</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Clarivate Analytics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.clarivate.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <SurName>Sanjay Lahurikar</SurName>
-    <EmailAddress>mailto:sanjay.lahurikar@clarivate.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Satya Rath</SurName>
-    <EmailAddress>mailto:satyaprakash.rath@clarivate.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>mailto:science.ShibbolethSupport@clarivate.com</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="5"/>
+    <md:AssertionConsumerService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cortellis.thomsonreuterslifesciences.com/ngg/sso/saml2/responseGateway.do" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cortellis.com/intelligence/sso/saml2/responseGateway.do" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.test-perf.clarivate.com/api/sso/saml2/authorize" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2&amp;auth=Shibboleth" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=PROF&amp;auth=Shibboleth" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2ESI&amp;auth=Shibboleth" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2JCR&amp;auth=Shibboleth" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2ESI" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2JCR" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_PROF" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thomsoninnovation.com/tip-innovation/sso/saml2/idpresponse.do" index="127"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscriptions.techstreet.com/sso_sessions" index="130"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.derwentinnovation.com/tip-innovation/sso/saml2/idpresponse.do" index="131"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Clarivate Analytics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Clarivate Analytics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.clarivate.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Sanjay Lahurikar</md:SurName>
+    <md:EmailAddress>mailto:sanjay.lahurikar@clarivate.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Satya Rath</md:SurName>
+    <md:EmailAddress>mailto:satyaprakash.rath@clarivate.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>mailto:science.ShibbolethSupport@clarivate.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sri-test.sunet.se-api-saml2-metadata.xml b/swamid-2.0/sri-test.sunet.se-api-saml2-metadata.xml
index 053d6292..4f047a43 100644
--- a/swamid-2.0/sri-test.sunet.se-api-saml2-metadata.xml
+++ b/swamid-2.0/sri-test.sunet.se-api-saml2-metadata.xml
@@ -4,41 +4,41 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-10-27T12:37:43Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
-    <ns0:Extensions>
-      <ns2:UIInfo xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui">
-        <ns2:DisplayName xml:lang="en">SUNET Relationship Inventory</ns2:DisplayName>
-        <ns2:DisplayName xml:lang="sv">SUNET Relationship Inventory</ns2:DisplayName>
-        <ns2:Description xml:lang="en">Service used for documenting the SUNET relationship</ns2:Description>
-        <ns2:Description xml:lang="sv">Tjänst för att dokumentera SUNET relationship</ns2:Description>
-      </ns2:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIFBTCCAu2gAwIBAgIUQ37cS8NLmguFmpvCoPGh9H7qHncwDQYJKoZIhvcNAQEL
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SUNET Relationship Inventory</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SUNET Relationship Inventory</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Service used for documenting the SUNET relationship</mdui:Description>
+        <mdui:Description xml:lang="sv">Tjänst för att dokumentera SUNET relationship</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUQ37cS8NLmguFmpvCoPGh9H7qHncwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHc3BfYXV0aDAeFw0yMDEwMjMxMDM3MjlaFw0zMDEwMjEx
 MDM3MjlaMBIxEDAOBgNVBAMMB3NwX2F1dGgwggIiMA0GCSqGSIb3DQEBAQUAA4IC
 DwAwggIKAoICAQDrzOZ1IqAkoNlEBqnFIGCQtVleOqd3FqnBNNfeZuzqBylEaIq4
@@ -65,14 +65,14 @@ IA+BHmex1S0TFIxA7S4sUORvA+p/kNqFXYDph1a9Bk8oug/8CMzYqTk/An3t0O20
 ncJIZAUJX3JMfTQCC0ivrBCwgLOPDs4eYeObPdfrwO0h4lui5xeicp1lD3QxV1R9
 Vqi/B2Y7fjullgT4vvCWaaFAzeS9hYxpZMeX8vgXnqDfecQxQowhFAfRKAaOvY6/
 8BapJ6h4K/dGMU4FUajOHbdAW4r47ya+mzNQWbfQzQ4Mh6cU2NLnx+8=
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIFBTCCAu2gAwIBAgIUQ37cS8NLmguFmpvCoPGh9H7qHncwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUQ37cS8NLmguFmpvCoPGh9H7qHncwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHc3BfYXV0aDAeFw0yMDEwMjMxMDM3MjlaFw0zMDEwMjEx
 MDM3MjlaMBIxEDAOBgNVBAMMB3NwX2F1dGgwggIiMA0GCSqGSIb3DQEBAQUAA4IC
 DwAwggIKAoICAQDrzOZ1IqAkoNlEBqnFIGCQtVleOqd3FqnBNNfeZuzqBylEaIq4
@@ -99,22 +99,22 @@ IA+BHmex1S0TFIxA7S4sUORvA+p/kNqFXYDph1a9Bk8oug/8CMzYqTk/An3t0O20
 ncJIZAUJX3JMfTQCC0ivrBCwgLOPDs4eYeObPdfrwO0h4lui5xeicp1lD3QxV1R9
 Vqi/B2Y7fjullgT4vvCWaaFAzeS9hYxpZMeX8vgXnqDfecQxQowhFAfRKAaOvY6/
 8BapJ6h4K/dGMU4FUajOHbdAW4r47ya+mzNQWbfQzQ4Mh6cU2NLnx+8=
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sri-test.sunet.se/api/saml2/ls/"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sri-test.sunet.se/api/saml2/acs/" index="1"/>
-    <ns0:AttributeConsumingService index="1">
-      <ns0:ServiceName xml:lang="en">SUNET Relationship Inventory</ns0:ServiceName>
-      <ns0:RequestedAttribute 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" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-      <ns0:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
-    </ns0:AttributeConsumingService>
-  </ns0:SPSSODescriptor>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:Company>SUNET</ns0:Company>
-    <ns0:GivenName>Maria</ns0:GivenName>
-    <ns0:SurName>Haider</ns0:SurName>
-    <ns0:EmailAddress>mailto:mariah@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sri-test.sunet.se/api/saml2/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sri-test.sunet.se/api/saml2/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SUNET Relationship Inventory</md:ServiceName>
+      <md:RequestedAttribute 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" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Maria</md:GivenName>
+    <md:SurName>Haider</md:SurName>
+    <md:EmailAddress>mailto:mariah@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml b/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
index eaed045d..9561fa00 100644
--- a/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
+++ b/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
@@ -4,41 +4,41 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T18:06:34Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
   </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
-    <ns0:Extensions>
-      <ns2:UIInfo xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui">
-        <ns2:DisplayName xml:lang="en">SUNET Relationship Inventory</ns2:DisplayName>
-        <ns2:DisplayName xml:lang="sv">SUNET Relationship Inventory</ns2:DisplayName>
-        <ns2:Description xml:lang="en">Service used for documenting the SUNET relationship</ns2:Description>
-        <ns2:Description xml:lang="sv">Tjänst för att dokumentera SUNET relationship</ns2:Description>
-      </ns2:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIFBTCCAu2gAwIBAgIUBB21qpvpAcQAgRJi471Il/Fq5RQwDQYJKoZIhvcNAQEL
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SUNET Relationship Inventory</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SUNET Relationship Inventory</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Service used for documenting the SUNET relationship</mdui:Description>
+        <mdui:Description xml:lang="sv">Tjänst för att dokumentera SUNET relationship</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUBB21qpvpAcQAgRJi471Il/Fq5RQwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHc3BfYXV0aDAeFw0yMDExMTYxNjA4NDBaFw0zMDExMTQx
 NjA4NDBaMBIxEDAOBgNVBAMMB3NwX2F1dGgwggIiMA0GCSqGSIb3DQEBAQUAA4IC
 DwAwggIKAoICAQC6UTEPqy/L524ANXCxEkCE/duGoknk5aBh8r1mJ1AG44+eODKU
@@ -65,14 +65,14 @@ pKClIGBAo1JKx3byD1wzt3OaaAFzgzoGHBjofrGt6PXP5z+hypLPdBurVLVZj4jI
 +Sq0xlGA2KdXu9aguOOxz8QUsBWniINMZny5HCq+7QcltZO4jGiJIGHb8j7OysLN
 YziGV7ebnypSquosjPqkymuVZYM7pW1BcUxpNu+fNYHZ7nTt8QGDodWKpV1mvq7J
 u2DILJFDHG6NsygDB5HF7t4kMRyVy/xI+dAe80+WmjLKM33ybwW/suk=
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
-        <ns3:X509Data>
-          <ns3:X509Certificate>MIIFBTCCAu2gAwIBAgIUBB21qpvpAcQAgRJi471Il/Fq5RQwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUBB21qpvpAcQAgRJi471Il/Fq5RQwDQYJKoZIhvcNAQEL
 BQAwEjEQMA4GA1UEAwwHc3BfYXV0aDAeFw0yMDExMTYxNjA4NDBaFw0zMDExMTQx
 NjA4NDBaMBIxEDAOBgNVBAMMB3NwX2F1dGgwggIiMA0GCSqGSIb3DQEBAQUAA4IC
 DwAwggIKAoICAQC6UTEPqy/L524ANXCxEkCE/duGoknk5aBh8r1mJ1AG44+eODKU
@@ -99,22 +99,22 @@ pKClIGBAo1JKx3byD1wzt3OaaAFzgzoGHBjofrGt6PXP5z+hypLPdBurVLVZj4jI
 +Sq0xlGA2KdXu9aguOOxz8QUsBWniINMZny5HCq+7QcltZO4jGiJIGHb8j7OysLN
 YziGV7ebnypSquosjPqkymuVZYM7pW1BcUxpNu+fNYHZ7nTt8QGDodWKpV1mvq7J
 u2DILJFDHG6NsygDB5HF7t4kMRyVy/xI+dAe80+WmjLKM33ybwW/suk=
-</ns3:X509Certificate>
-        </ns3:X509Data>
-      </ns3:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sri.sunet.se/api/saml2/ls/"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sri.sunet.se/api/saml2/acs/" index="1"/>
-    <ns0:AttributeConsumingService index="1">
-      <ns0:ServiceName xml:lang="en">SUNET Relationship Inventory</ns0:ServiceName>
-      <ns0:RequestedAttribute 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" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-      <ns0:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
-    </ns0:AttributeConsumingService>
-  </ns0:SPSSODescriptor>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:Company>SUNET</ns0:Company>
-    <ns0:GivenName>Maria</ns0:GivenName>
-    <ns0:SurName>Haider</ns0:SurName>
-    <ns0:EmailAddress>mailto:mariah@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sri.sunet.se/api/saml2/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sri.sunet.se/api/saml2/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SUNET Relationship Inventory</md:ServiceName>
+      <md:RequestedAttribute 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" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Maria</md:GivenName>
+    <md:SurName>Haider</md:SurName>
+    <md:EmailAddress>mailto:mariah@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sse.instructure.com-saml2.xml b/swamid-2.0/sse.instructure.com-saml2.xml
index 89409e26..b796b448 100644
--- a/swamid-2.0/sse.instructure.com-saml2.xml
+++ b/swamid-2.0/sse.instructure.com-saml2.xml
@@ -7,9 +7,9 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -31,17 +31,17 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns3:KeySize xmlns:ns3="http://www.w3.org/2001/04/xmlenc#">128</ns3:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -63,9 +63,9 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://sse.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://sse.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
diff --git a/swamid-2.0/stage.math.su.se-shibboleth.xml b/swamid-2.0/stage.math.su.se-shibboleth.xml
index 85c13364..e986b8e0 100644
--- a/swamid-2.0/stage.math.su.se-shibboleth.xml
+++ b/swamid-2.0/stage.math.su.se-shibboleth.xml
@@ -104,8 +104,6 @@ CtTq9Y6Fdin4GnIMTz1z2vKAfUB1mg==
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <!-- ORGANIZATION INFO -->
-  <!-- CONTACTS -->
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SU, Matematiska institutionen</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SU, Department of Mathematics </md:OrganizationName>
@@ -130,7 +128,7 @@ CtTq9Y6Fdin4GnIMTz1z2vKAfUB1mg==
     <md:GivenName>IT Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:shibboleth-support@math.su.se</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>IT Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:shibboleth-security@math.su.se</md:EmailAddress>
   </md:ContactPerson>
diff --git a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
index ad4ead53..4f5f2208 100644
--- a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
@@ -20,10 +20,10 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/staging.cloudmore.com-shibboleth.xml b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
index 4297a9e7..f0a059d1 100644
--- a/swamid-2.0/staging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
@@ -20,10 +20,10 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/staging.ilabsolutions.com.xml b/swamid-2.0/staging.ilabsolutions.com.xml
index 4361e5c5..1b56cc20 100644
--- a/swamid-2.0/staging.ilabsolutions.com.xml
+++ b/swamid-2.0/staging.ilabsolutions.com.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">iLab Solutions</mdui:DisplayName>
@@ -48,27 +48,27 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ki-int.ilabx.com/account/saml/swamid" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-int.ilabx.com/account/saml/swamid" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lund-int.ilabx.com/account/saml/swamid" index="4"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">iLab Solutions</ServiceName>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">ILab Solutions, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ILab Solutions, LLC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>ID Integration support</GivenName>
-    <EmailAddress>mailto:integrations_id@ilabsolutions.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:ilab-support@agilent.com</EmailAddress>
-  </ContactPerson>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">iLab Solutions</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ILab Solutions, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ILab Solutions, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ID Integration support</md:GivenName>
+    <md:EmailAddress>mailto:integrations_id@ilabsolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:ilab-support@agilent.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/stipendier.uu.se-stipendium.xml b/swamid-2.0/stipendier.uu.se-stipendium.xml
index 98dd0c7f..b16ce11d 100644
--- a/swamid-2.0/stipendier.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendier.uu.se-stipendium.xml
@@ -61,8 +61,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="1" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stipendier.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="2"/>
-    <md:AssertionConsumerService xmlns:ns1="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" ns1:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
-    <md:AssertionConsumerService xmlns:ns1="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" ns1:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
+    <md:AssertionConsumerService xmlns:ns6="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" ns6:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
+    <md:AssertionConsumerService xmlns:ns6="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" ns6:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
     <md:AttributeConsumingService index="0" isDefault="true">
       <md:ServiceName xml:lang="sv">Stipendiehantering</md:ServiceName>
       <md:ServiceName xml:lang="en">Scholarship</md:ServiceName>
diff --git a/swamid-2.0/studiumbb.uu.se-studium.xml b/swamid-2.0/studiumbb.uu.se-studium.xml
index 5468e764..e1aaa526 100644
--- a/swamid-2.0/studiumbb.uu.se-studium.xml
+++ b/swamid-2.0/studiumbb.uu.se-studium.xml
@@ -13,7 +13,7 @@
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisco:DiscoveryResponse xmlns:idpdisco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studiumbb.uu.se/auth-saml/saml/login/ali as/_122_1?disco=true" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studiumbb.uu.se/auth-saml/saml/login/ali as/_122_1?disco=true" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Studium</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Studium</mdui:DisplayName>
diff --git a/swamid-2.0/sunet.instructure.com-saml2.xml b/swamid-2.0/sunet.instructure.com-saml2.xml
index 7f3a66d7..60d4eb5b 100644
--- a/swamid-2.0/sunet.instructure.com-saml2.xml
+++ b/swamid-2.0/sunet.instructure.com-saml2.xml
@@ -26,9 +26,9 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -50,17 +50,17 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -82,9 +82,9 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://sunet.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://sunet.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml
index 91946116..328fc3b5 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
     <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://swamid-2.grandid.com/module.php/saml/sp/discoresp.php"/>
   </md:Extensions>
diff --git a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
index 91074612..affcab5f 100644
--- a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -4,14 +4,14 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-09-13T11:39:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
-    </attr:EntityAttributes>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://swamid2.shh.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://swamid2.shh.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">shh.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Sophiahemmet Högskola</mdui:DisplayName>
@@ -29,8 +29,8 @@
         <mdui:DomainHint>sophiahemmet.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.34547,18.07525</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
@@ -52,22 +52,22 @@ YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
 URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid2.shh.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid2.shh.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid2.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid2.shh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid2.shh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid2.shh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid2.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid2.shh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">shh.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
@@ -89,35 +89,35 @@ YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
 URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SHH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Sophiahemmet University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Sophiahemmet University</Company>
-    <SurName>Sophiahemmet IT</SurName>
-    <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
-    <TelephoneNumber>+46 8 406 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Sophiahemmet University</Company>
-    <SurName>Sophiahemmet IT</SurName>
-    <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
-    <TelephoneNumber>+46 8 406 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Sophiahemmet University</Company>
-    <SurName>Sophiahemmet IT</SurName>
-    <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
-    <TelephoneNumber>+46 8 406 2525</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SHH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Sophiahemmet University</md:Company>
+    <md:SurName>Sophiahemmet IT</md:SurName>
+    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Sophiahemmet University</md:Company>
+    <md:SurName>Sophiahemmet IT</md:SurName>
+    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Sophiahemmet University</md:Company>
+    <md:SurName>Sophiahemmet IT</md:SurName>
+    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
index 60a7bb0f..70cbe17f 100644
--- a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
@@ -10,8 +10,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter (test)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities (test)</mdui:DisplayName>
@@ -20,29 +20,29 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC5jCCAc6gAwIBAgIQYjYAQu8/KadPlSIMXM8g9DANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUyNzQzWhcNMjQwODE1MDUyNzQzWjAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76aZnzXY86Yt2jVfXz+4//tMMqyE3EcJhPBoUDY0KEbTTFiKtnMNzSH4TfRPvzjUMN6PB6Wz/xZvPGSpOh92Bq5+AMKmktyNqLRnFnrnqJ5jqcPbjGiil/Mj2VXgLPnm7XX4rZ80mX7aTDsQdwu4R7gmXCwpLfknLkOwpMol2RpgaJdW6ivVGhjkSK+vBwY0MqcqkO7jhsYyYbCDmrj08Z7gIG0k5TbrxhUbh5jjU7DJ8b+sJwudmGuaTfYzKWFaSsezfbchcxJ1yyNuEJAClOhfE/cRwK/9UqmyFEtI6xlQEGxKGFgVqgrPxBzk+HY0Kr3m36Mn8OiskqGMmO523AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH3heMlmYz12to6cYs/dhYqbmehJIZ9f7u4Ro3fkOi56lTbj6KUwolBCCLrUVtdHNDnxEROv19htU7APmKpMNGjasw2B9lg1Gs7EQ19NVZrEd7jMTuRjYDu8QyCnw6jVQKClgWtCsZOHKGuruYxtmV0GKSwCxUtdpcPXrSbN87b5ZSE3Ag8zrMStAklMOIC0AwxTIUUidHyOXgcG9vv6R20U5NRDnFdc8GKV9TiPLIbuP2zwWZfqEdZ9JNb4A0aUVLPBEJmggwGPN4Ofqb8UI77GIyECg2IaJbgy8TDRYO864D3tEMajRvYSP0BG/EoNE6zs0+BvliaWAXOzdKs8zCc=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC4DCCAcigAwIBAgIQeZLaiI7pJZ5JznGP7yiLvDANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUyNDU5WhcNMjQwODE1MDUyNDU5WjAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlYJ1dtqku58NJF1P1jURcJYHPlfNbfam9gFSBqDpPEUEyDXBk2cUAMTGF9KDRRPel3bZka+g0mNQal/swxcBRbJwapEGrb+SKdXErhPUO2VEDCEvWYZsmX7Brh803kLiUnu/+fOWUP0Gy7TjR3XQreu8FxGuzQR8MoDocCBDlyEaqnB8VrYv3BFWsPbnbxlE513lgS6PqFDbqXAffdSf7VOIjT93zfeunl/gE4GeFvx+GpRJqRw1xtweF7hj3bq9YZ7ru0AtBH5F0VLSPFlLlAS/4chhLuB7M/b91QBU16zafnJMEqAep5kOWhtc/Cky2NOet3gkAn7QSc5zsZa9PAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACa5W5i0lpmIIdk6RrhgeGe6cKva511+hvs15hcZHzXCF5dRMFLTq7NbYUsDkxwBdDCRj5naI45kUQcVWS5k2Fm+pN8csiBy0DTt0zUV7EbfAO12n78GPbfxn7FwT9lguSaf2fwIJl/Q0dVY4VuZ+McVpWIYU/qQ51cjqOz9UblMOuy7tm558uoNWmDtJGzlT0WZ8h88EAdKSZ8JU17Rixjv38nyFwHM5ZdoM8eVMH15gp9xxEvq8KUBYOGtX7q/F798+HAHyha1v5HPO4JnFBuQpAEImHLFyDndOZXnd1VNk6EoSclX/URyp3EcxmI+azNoxP8C0atgRfB/pU1d/78=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://te-id.statenssc.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://te-id.statenssc.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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://te-id.statenssc.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://te-id.statenssc.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://te-id.statenssc.se/adfs/ls/" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQYjYAQu8/KadPlSIMXM8g9DANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUyNzQzWhcNMjQwODE1MDUyNzQzWjAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76aZnzXY86Yt2jVfXz+4//tMMqyE3EcJhPBoUDY0KEbTTFiKtnMNzSH4TfRPvzjUMN6PB6Wz/xZvPGSpOh92Bq5+AMKmktyNqLRnFnrnqJ5jqcPbjGiil/Mj2VXgLPnm7XX4rZ80mX7aTDsQdwu4R7gmXCwpLfknLkOwpMol2RpgaJdW6ivVGhjkSK+vBwY0MqcqkO7jhsYyYbCDmrj08Z7gIG0k5TbrxhUbh5jjU7DJ8b+sJwudmGuaTfYzKWFaSsezfbchcxJ1yyNuEJAClOhfE/cRwK/9UqmyFEtI6xlQEGxKGFgVqgrPxBzk+HY0Kr3m36Mn8OiskqGMmO523AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH3heMlmYz12to6cYs/dhYqbmehJIZ9f7u4Ro3fkOi56lTbj6KUwolBCCLrUVtdHNDnxEROv19htU7APmKpMNGjasw2B9lg1Gs7EQ19NVZrEd7jMTuRjYDu8QyCnw6jVQKClgWtCsZOHKGuruYxtmV0GKSwCxUtdpcPXrSbN87b5ZSE3Ag8zrMStAklMOIC0AwxTIUUidHyOXgcG9vv6R20U5NRDnFdc8GKV9TiPLIbuP2zwWZfqEdZ9JNb4A0aUVLPBEJmggwGPN4Ofqb8UI77GIyECg2IaJbgy8TDRYO864D3tEMajRvYSP0BG/EoNE6zs0+BvliaWAXOzdKs8zCc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC4DCCAcigAwIBAgIQeZLaiI7pJZ5JznGP7yiLvDANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwHhcNMTkwODE2MDUyNDU5WhcNMjQwODE1MDUyNDU5WjAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSB0ZS1pZC5zdGF0ZW5zc2Muc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlYJ1dtqku58NJF1P1jURcJYHPlfNbfam9gFSBqDpPEUEyDXBk2cUAMTGF9KDRRPel3bZka+g0mNQal/swxcBRbJwapEGrb+SKdXErhPUO2VEDCEvWYZsmX7Brh803kLiUnu/+fOWUP0Gy7TjR3XQreu8FxGuzQR8MoDocCBDlyEaqnB8VrYv3BFWsPbnbxlE513lgS6PqFDbqXAffdSf7VOIjT93zfeunl/gE4GeFvx+GpRJqRw1xtweF7hj3bq9YZ7ru0AtBH5F0VLSPFlLlAS/4chhLuB7M/b91QBU16zafnJMEqAep5kOWhtc/Cky2NOet3gkAn7QSc5zsZa9PAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACa5W5i0lpmIIdk6RrhgeGe6cKva511+hvs15hcZHzXCF5dRMFLTq7NbYUsDkxwBdDCRj5naI45kUQcVWS5k2Fm+pN8csiBy0DTt0zUV7EbfAO12n78GPbfxn7FwT9lguSaf2fwIJl/Q0dVY4VuZ+McVpWIYU/qQ51cjqOz9UblMOuy7tm558uoNWmDtJGzlT0WZ8h88EAdKSZ8JU17Rixjv38nyFwHM5ZdoM8eVMH15gp9xxEvq8KUBYOGtX7q/F798+HAHyha1v5HPO4JnFBuQpAEImHLFyDndOZXnd1VNk6EoSclX/URyp3EcxmI+azNoxP8C0atgRfB/pU1d/78=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://te-id.statenssc.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://te-id.statenssc.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://te-id.statenssc.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://te-id.statenssc.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://te-id.statenssc.se/adfs/ls/" index="2"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter (test)</md:ServiceName>
       <md:ServiceName xml:lang="en">Accounting and payroll services for employees at Swedish authorities (test)</md:ServiceName>
@@ -51,29 +51,29 @@
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md: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"/>
     </md:AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Statens Servicecenter</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter (test)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.statenssc.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>William</GivenName>
-    <SurName>Åslund</SurName>
-    <EmailAddress>mailto:William.SteinAslund@statenssc.se</EmailAddress>
-    <TelephoneNumber>+46771451000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>it-andralinjen</GivenName>
-    <EmailAddress>mailto:it-andralinjen@statenssc.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>idplattform</GivenName>
-    <EmailAddress>mailto:idplattform@forsakringskassan.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>IT-sakerhet@statenssc.se</GivenName>
-    <EmailAddress>mailto:IT-sakerhet@statenssc.se</EmailAddress>
-  </ContactPerson>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Statens Servicecenter</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter (test)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.statenssc.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>William</md:GivenName>
+    <md:SurName>Åslund</md:SurName>
+    <md:EmailAddress>mailto:William.SteinAslund@statenssc.se</md:EmailAddress>
+    <md:TelephoneNumber>+46771451000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>it-andralinjen</md:GivenName>
+    <md:EmailAddress>mailto:it-andralinjen@statenssc.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>idplattform</md:GivenName>
+    <md:EmailAddress>mailto:idplattform@forsakringskassan.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>IT-sakerhet@statenssc.se</md:GivenName>
+    <md:EmailAddress>mailto:IT-sakerhet@statenssc.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml b/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml
index fdf4fb9d..2bd64634 100644
--- a/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml
+++ b/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml
@@ -21,9 +21,9 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
-      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
-      </Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml b/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
index 11536e71..c728aeb3 100644
--- a/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
+++ b/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test-examensansokan.portal.chalmers.se-ny">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-03-18T16:59:57Z">
diff --git a/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml b/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml
index b0b1b492..591e2cc0 100644
--- a/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml
+++ b/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test-nais.i.uhr.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-05-12T10:21:12Z">
diff --git a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
index a9d534ac..88a86c77 100644
--- a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="test.lararlyftet-validering.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-12-10T15:24:23Z">
diff --git a/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml b/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml
index a969fd98..f3e6c88e 100644
--- a/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml
@@ -42,7 +42,6 @@
         <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <!-- First signing certificate is BackChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -74,7 +73,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- Second signing certificate is FrontChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -141,15 +139,14 @@
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidpv4.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidpv4.lu.se/idp/profile/SAML2/Redirect/SLO"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidpv4.lu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/Redirect/SSO"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidpv4.lu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/POST/SSO"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
     </md:Extensions>
-    <!-- First signing certificate is BackChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -181,7 +178,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- Second signing certificate is FrontChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
diff --git a/swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml b/swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
index d58454c5..e1432faf 100644
--- a/swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
@@ -43,25 +43,25 @@ wWE+vceD2r7oFUYHr1E07cyX20HwNU1LL3TthPaNhs7M2ImLlYHapw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">Microsoft Academic Verification Engine</ServiceName>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Microsoft</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Gerry O'Brien</GivenName>
-    <EmailAddress>mailto:Gerry.OBrien@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Gaurav Kakodkar</GivenName>
-    <EmailAddress>mailto:gauraka@microsoft.com</EmailAddress>
-  </ContactPerson>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Microsoft Academic Verification Engine</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md: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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Microsoft</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Microsoft</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gerry O'Brien</md:GivenName>
+    <md:EmailAddress>mailto:Gerry.OBrien@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gaurav Kakodkar</md:GivenName>
+    <md:EmailAddress>mailto:gauraka@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ths.instructure.com-saml2.xml b/swamid-2.0/ths.instructure.com-saml2.xml
index 4e8ecb4d..e6344f1f 100644
--- a/swamid-2.0/ths.instructure.com-saml2.xml
+++ b/swamid-2.0/ths.instructure.com-saml2.xml
@@ -28,9 +28,9 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
 IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
@@ -52,17 +52,17 @@ BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
 XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
 1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
 Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
 IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
@@ -84,9 +84,9 @@ BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
 XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
 1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
 Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://ths.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://ths.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
@@ -99,7 +99,6 @@ SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <!-- for SIRTFI -->
   <md:Organization>
     <md:OrganizationName xml:lang="sv">EHS</md:OrganizationName>
     <md:OrganizationName xml:lang="en">UCS</md:OrganizationName>
diff --git a/swamid-2.0/tools.kib.ki.se-shibboleth.xml b/swamid-2.0/tools.kib.ki.se-shibboleth.xml
index 2954de70..5d233586 100644
--- a/swamid-2.0/tools.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/tools.kib.ki.se-shibboleth.xml
@@ -72,7 +72,7 @@ uX4aWLHHp/MpbOpwCAVWQDlPdXYS
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tools.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <md:Organization>
     <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
diff --git a/swamid-2.0/ubas.lu.se-shibboleth.xml b/swamid-2.0/ubas.lu.se-shibboleth.xml
index efcb10e2..d9643595 100644
--- a/swamid-2.0/ubas.lu.se-shibboleth.xml
+++ b/swamid-2.0/ubas.lu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ubas.lu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-11-04T06:58:09Z">
diff --git a/swamid-2.0/uppsala-test.blackboard.com-lms.xml b/swamid-2.0/uppsala-test.blackboard.com-lms.xml
index 892d8ab9..0cabd884 100644
--- a/swamid-2.0/uppsala-test.blackboard.com-lms.xml
+++ b/swamid-2.0/uppsala-test.blackboard.com-lms.xml
@@ -13,7 +13,7 @@
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisco:DiscoveryResponse xmlns:idpdisco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uppsala-test.blackboard.com/auth-saml/saml/login/alias/_102_1?disco=true" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uppsala-test.blackboard.com/auth-saml/saml/login/alias/_102_1?disco=true" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Learning Management System - Blackboard</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Lärplattformen Blackboard</mdui:DisplayName>
diff --git a/swamid-2.0/uppsala.instructure.com-saml2.xml b/swamid-2.0/uppsala.instructure.com-saml2.xml
index 825bdf37..0326c824 100644
--- a/swamid-2.0/uppsala.instructure.com-saml2.xml
+++ b/swamid-2.0/uppsala.instructure.com-saml2.xml
@@ -52,7 +52,7 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <ns1:KeySize xmlns:ns1="http://www.w3.org/2001/04/xmlenc#">128</ns1:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/uraccess.net-shibboleth.xml b/swamid-2.0/uraccess.net-shibboleth.xml
index 99dcafe0..830d0b79 100644
--- a/swamid-2.0/uraccess.net-shibboleth.xml
+++ b/swamid-2.0/uraccess.net-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://uraccess.net/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-12-10T21:25:18Z">
diff --git a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
index 600f4099..79e5a40d 100644
--- a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
+++ b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">O'Reilly Learning Platform</mdui:DisplayName>
@@ -18,7 +18,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <!-- Serial No. 1690942378109942522077, expires on Fri Jan 11 20:48:32 2030 GMT -->
           <ds:X509Certificate>
 MIIC7DCCAdSgAwIBAgIJW6qKHeTxYmDdMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNhZmFyaWp2LmF1dGgwLmNvbTAeFw0xNjA1MDQxOTQ4MzJaFw0zMDAxMTEy
@@ -42,31 +41,31 @@ xuvjUFEYjJuhY/HwYbmCghKebqIusOEkfaLO0HZmwpI=
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safarijv.auth0.com/logout"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/logout"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/login/callback?connection=uppsala-university" index="0" isDefault="true"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">O'Reilly Learning Platform</ServiceName>
-      <ServiceDescription xml:lang="en">Use of this SP requires an Enterprise or Academic subscription to the O'Reilly Learning Platform. Please visit https://www.oreilly.com/ for details.</ServiceDescription>
-      <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"/>
-      <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">O'Reilly Media</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Safari Books Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.oreilly.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Jesse Banning</GivenName>
-    <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jesse Banning</GivenName>
-    <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Matt Kirk</GivenName>
-    <EmailAddress>mailto:security-feedback@oreilly.com</EmailAddress>
-  </ContactPerson>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/login/callback?connection=uppsala-university" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">O'Reilly Learning Platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Use of this SP requires an Enterprise or Academic subscription to the O'Reilly Learning Platform. Please visit https://www.oreilly.com/ for details.</md:ServiceDescription>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">O'Reilly Media</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Safari Books Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.oreilly.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jesse Banning</md:GivenName>
+    <md:EmailAddress>mailto:safari-prof-serv@oreilly.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jesse Banning</md:GivenName>
+    <md:EmailAddress>mailto:safari-prof-serv@oreilly.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Matt Kirk</md:GivenName>
+    <md:EmailAddress>mailto:security-feedback@oreilly.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml b/swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml
index c4975e79..38c69779 100644
--- a/swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml
+++ b/swamid-2.0/urn-mace-feide.no-services-no.inspera.assessment.test.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="false">
@@ -72,7 +72,7 @@
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-test.inspera.no/edugain/endpoint/logout"/>
diff --git a/swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml b/swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml
index 8eb778d7..5bc59589 100644
--- a/swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml
+++ b/swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml
@@ -4,15 +4,15 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-03-02T14:07:24Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+    <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">itslearning</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">itslearning</mdui:DisplayName>
@@ -23,8 +23,8 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDSjCCAjKgAwIBAgIJANHlAs0Pmk6oMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
@@ -47,8 +47,8 @@ pPxFefcnvS2BADNY6p7jdfy+/wYcNVq9BJlg2jcp12rv27D++qmyRxsRH+47L/xC
 L0Gxkp4Wyq0nkpjQ4E2v9nFsPiXf4kL8Cc7Oa87n</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDSjCCAjKgAwIBAgIJANHlAs0Pmk6oMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
@@ -71,21 +71,21 @@ pPxFefcnvS2BADNY6p7jdfy+/wYcNVq9BJlg2jcp12rv27D++qmyRxsRH+47L/xC
 L0Gxkp4Wyq0nkpjQ4E2v9nFsPiXf4kL8Cc7Oa87n</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itsltest.com/elogin/SingleLogoutHandler.aspx"/>
-    <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://www.itsltest.com/elogin/AssertionConsumerService.aspx" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">itslearning (test)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">itslearning (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.itslearning.eu</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itsltest.com/elogin/SingleLogoutHandler.aspx"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itsltest.com/elogin/AssertionConsumerService.aspx" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">itslearning (test)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">itslearning (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itslearning.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xml:lang="en" contactType="technical">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xml:lang="en" contactType="support">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/us.cloudmore.com-shibboleth.xml b/swamid-2.0/us.cloudmore.com-shibboleth.xml
index c3b88e09..945ddc35 100644
--- a/swamid-2.0/us.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/us.cloudmore.com-shibboleth.xml
@@ -20,10 +20,10 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
diff --git a/swamid-2.0/utmanande.math.su.se-shibboleth.xml b/swamid-2.0/utmanande.math.su.se-shibboleth.xml
index bab12027..ca2b91f3 100644
--- a/swamid-2.0/utmanande.math.su.se-shibboleth.xml
+++ b/swamid-2.0/utmanande.math.su.se-shibboleth.xml
@@ -148,8 +148,6 @@ UWAgYN1/WaIEogIgRbj/RgT6fZue7+m+1tnXfE1qV3/2jA==
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <!-- ORGANIZATION INFO -->
-  <!-- CONTACTS -->
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SU, Matematiska institutionen</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SU, Department of Mathematics </md:OrganizationName>
diff --git a/swamid-2.0/uu-se.zoom.us-old.xml b/swamid-2.0/uu-se.zoom.us-old.xml
index b111cae5..07b8fa7f 100644
--- a/swamid-2.0/uu-se.zoom.us-old.xml
+++ b/swamid-2.0/uu-se.zoom.us-old.xml
@@ -27,7 +27,6 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=267521030&amp;l=en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <!-- NOTE: New Zoom Certificate 2022-2023 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -67,7 +66,6 @@ mYIp+qov+EzUDeCQ
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- NOTE: Expires 2022-02-02 23:59:59 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -115,25 +113,25 @@ U7U1sUyCVwFp2Z7D3xnz+erklZPsBxecF7mTebgi9XUUUJDiEA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uu-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-se.zoom.us/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/uu-se.zoom.us.xml b/swamid-2.0/uu-se.zoom.us.xml
index 20896d41..23ed190f 100644
--- a/swamid-2.0/uu-se.zoom.us.xml
+++ b/swamid-2.0/uu-se.zoom.us.xml
@@ -25,7 +25,6 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=267521030&amp;l=en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <!-- NOTE: New Zoom certificate 2022-2023 -->
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
diff --git a/swamid-2.0/uu.test.diva-portal.org-shibboleth.xml b/swamid-2.0/uu.test.diva-portal.org-shibboleth.xml
index 50eb758f..6cac4cc8 100644
--- a/swamid-2.0/uu.test.diva-portal.org-shibboleth.xml
+++ b/swamid-2.0/uu.test.diva-portal.org-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://uu.test.diva-portal.org/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uu.test.diva-portal.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/valda.uhr.se-shibboleth.xml b/swamid-2.0/valda.uhr.se-shibboleth.xml
index 5217162a..59e2b5b3 100644
--- a/swamid-2.0/valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/valda.uhr.se-shibboleth.xml
@@ -98,7 +98,6 @@ RrcgAwWR573F+C6Cqrt89uDpyQ8ZM2Z+LZdIvrhBYV/lO7Dk9uZF2d9f7ew48DeA
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://valda.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <!-- Required för personnummer -->
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Valda</md:ServiceName>
       <md:ServiceName xml:lang="sv">Valda</md:ServiceName>
diff --git a/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml b/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml
index 4a78b740..e6102b96 100644
--- a/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml
+++ b/swamid-2.0/vmfront.lan.kth.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://vmfront.lan.kth.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vmfront.lan.kth.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
index dbaf5857..34a5da69 100644
--- a/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
@@ -61,7 +61,6 @@
         <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel-->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -174,155 +173,10 @@ YgmmVKJz7UoRoFo=
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test-v4.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test-v4.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
--->
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test-v4.kau.se:8443/idp/profile/SAML2/SOAP/SLO"/>
--->
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns1:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <!--<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test-v4.kau.se/idp/profile/Shibboleth/SSO"/>
--->
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns7:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns7:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService xmlns:ns7="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns7:supportsRequestedAttributes="true" Location="https://weblogin-test-v4.kau.se/idp/profile/SAML2/POST/SSO"/>
   </md:IDPSSODescriptor>
-  <!--    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-        </Extensions>
-
-        -->
-  <!-- First signing certificate is BackChannel, the Second is FrontChannel-->
-  <!--
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-MIIFSDCCAzCgAwIBAgIVAK3hJPC38AiIQXjA79Aky/ceGCDUMA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF3dlYmxvZ2luLXRlc3QtdjQua2F1LnNlMB4XDTIyMDYy
-MTA4MzIzM1oXDTQyMDYyMTA4MzIzM1owIjEgMB4GA1UEAwwXd2VibG9naW4tdGVz
-dC12NC5rYXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1k9bL
-++zRcegCvIPwc6c0uoqWbfNsXFreLqEfOzi3fd1Yb8aEBVaATlyqMu6uAZLXrLF6
-IVB0okugeDHKtM3iG/V8aoN++UeIPs35cmqXO0pULaWikGCEBDKVFKx3fpVx8m0E
-K3gN/R6JQa17DGirTWtmmFFWb0Dtj36RYrg19yzMZiWl2Y2O5D9KdEZ5zUEa5U79
-AzipieRolsRb0SXiemN9W8BE1wbiJyKljX7nfQLiZR5TmoQVTmoeJp9eLBFmxLK+
-UXavE8M28aA3pxJeuMDtLDC7NUGI493UYX9SqPXY+1D85ACAlumB+1xY5AQ6eh5o
-EonmhFK3tKhlWn6/fqEs0G9Md01OoxW+s7bfJH82giU5aDLIQZrE3cGIUo6mj4ru
-0RxJgJwY54VtncNhMI405pNFosTORS4YYjwCgr/sW5FDs7c1bKMi87+IOC7upJ/3
-u2uDK/jK0CV+qsk0ZyQ1A2M3zkZMHanj/ZcciQcqoG3F0GKRzEm9i65Vudy2peUX
-oIEgPkKtAPhJqU4sP5yvJeF1KYGi+yVvqIyRTdUux1QBA6UttWLFeYS/2Lp74eqT
-+fI5wbqjgfZEyuk3H0qPWnYuWHBukwqhJVQAb6ZaASnN6BsyRT3ZpPmttxe2NFXR
-AetlcOKqTsEB80OgGjHjePhDWdtXmqC0sWcRxwIDAQABo3UwczAdBgNVHQ4EFgQU
-z5BC4sAbcWPAvEPbEjYx40bC80UwUgYDVR0RBEswSYIXd2VibG9naW4tdGVzdC12
-NC5rYXUuc2WGLmh0dHBzOi8vd2VibG9naW4tdGVzdC12NC5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggIBACDH9lO3dFEOANCHCcljmBEZAtAI
-RTTMiW30fZkuBN3bUu25dHSDSmSt7AfXUjdkLkV0ziPPFAUgldvFyBRyjBxd+5WJ
-7rnP+FJ4YYFj5fol7C0+ZMX+G7T37ya4EmytI4xhQpPWesg1WSFstZnIPeo7o10H
-9bIgFfCQ6IhmfdpiDrUW+fVsLoJcVYOOGfEaoCHV6Q0dfhF6rsgbh66t7lxUa9zD
-/F3yuUzNWEdH0jAcW/wU7mSaeEOAAHuU6h96wGd7Z6tiqLB8/tezMeIkU61HkDNs
-btkXPA1RwuHH6jPtXSefgwAlLM0OeR+uwSBtSN38n4/utx+99at6tpmWQVZkMDj2
-KCUWp8+KNyzW9rZtEvW5bqxWMB8Esj9TbB8cQfYJOuaYNffpHYwTIMKwXL6snLot
-a7RqzY158AmMC4X9Ts7fvsCYsVQG7HMjRofluuEv/v6YFnAk5SifsPJGStDpcifO
-zm75pl9JzrXAyNyj7fkaSKDnzO0O8iGfg0IBs8jz49MhPISdI+vC/mjOYdPydwxn
-Q4BnLQi7CG3VbRhmkEpwkBZ19UvFUfvpxulubcomnfVYse1i+snMo+jbzxxxosm/
-mzx1d1VU1xwEfspoOFI6wKhW/eoWyCMCTXR+mxALDu9/wGbo8+m1TyhUTwzcVaOO
-ZIEHQfl81U/gUVLi
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-            </ds:KeyInfo>
-
-        </KeyDescriptor>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-MIIFSDCCAzCgAwIBAgIVANBSNV8Fym0k+wYlloWqL27Pvhv4MA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF3dlYmxvZ2luLXRlc3QtdjQua2F1LnNlMB4XDTIyMDYy
-MTA4MzE1NFoXDTQyMDYyMTA4MzE1NFowIjEgMB4GA1UEAwwXd2VibG9naW4tdGVz
-dC12NC5rYXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFYBAr
-EZKh27UsRvs+r4ihtVWJZ44b3O+FSFsh+1lV+elZwek2nmkfNd431l1Tv+b7S31W
-eqN+6z5+3r6nKdyPo3BB+Erxa3LaW0Vn9gq9gUAyHgV1cNVHcdYO7YbyLympxopX
-Hp/fs6MGzHezpxlsSyxWvK0otnpwfBRUi5PDGBrxQGB8fXzbM7uDgEw6kM678Dz4
-ip580JsiJ8k2+D8isqdVMWSbzMyrzLJNhmUCsvDNOC9j3S97z8c4xxT/nqOBqSDN
-IiGEEFV08/2PL0+sRdIg7u3uXqXPo+/wR1t8xSX4dh7dxxPsdKV+3lQBf9T3N0kq
-8TcOTooJBwX2L3+4QmPSoEg+6CMAELgnsJgg/81312/XmQxohc4C3oilNZdtUo1z
-3HKCfxM8eaXfb0gUKzNCd8NCOWjhntc/Cfkg+fVb9eUvXoHqkp4/oI+VEhLb9MZu
-39oFEBMRTSEUrT/cP113/h+qazwuDIK+9ROzYm74DLOoB6QYEUNqqse+LV7NMUum
-t5wLbxDQmuSWEMh4Gf5mc6FI5C0JV3RUaaFQx8U7JEfdkhSu9Lyv+fUDUYwgbkSR
-Wjnt8jKnpEsEqFoNPN75TExTJFoerVDpLQgeuNDhB4WpiB/hBkru+0Ar+gU9/AAE
-DMiw8/phNnvToZCENisdQQKu3qhau0UHJstcyQIDAQABo3UwczAdBgNVHQ4EFgQU
-PTINVWwKullQ8KBPOEih3ssJVCowUgYDVR0RBEswSYIXd2VibG9naW4tdGVzdC12
-NC5rYXUuc2WGLmh0dHBzOi8vd2VibG9naW4tdGVzdC12NC5rYXUuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggIBAGdI9pD5p/ZcuchkaEAYItATo81/
-gzv/CZyP4Hg0nYSUG3r+yXOOV1yCv5NPT0FXvdIJm9ONYBOB4ShZKLnQpWnJppPm
-XAg6eJ85wWt+ubvQwHUETey0zfmvUgF+jN1wBaHvMeoELdsxhUOZMjeNnjApLivJ
-HFV2VujXj8zH16MFvADdNLf9qy0AWEnDIaFqGu4dFZJRdXeTYPaCDAgewXIIXjUj
-CTi+buw2svZxV7fp9Cc0/KDxIxWMAICm5+T+r3T7L39OTxcVwFfvzZf+322iMoSl
-NXeoONDHKSxVRWK+Y/DbGlXUIDCtqmTecQF7GrjHcWhxQGJfNdApChsrh/xvZQJQ
-EQ4mkYABcALlB5DAhfGxZMzyyLXufH7OMBe7mC9FpifcxmCaErqtD3iPuR1v/vjP
-ml9iVTDe1cnnKOrz5M3gPxvUOLFFYzn8JZely3F8va4a0FAYIO5XuKL9F1PoLY0N
-5f2cRR6GklzvD/Bew26F4Q6cOW7ttNT9LOFR1PEG7F54FEIPCpEAvCpZBObwCzWP
-HVUqbPa95AcSUn3h8z3d9IxD1X1YlWkwAexZlcecaA1ex8txd2U355X51WZ3BAuN
-XUWnXrKJUDfzJne/dgoq0XPc8GTxsh5asQEtdgegWgAFVdquT/TTQJAkwCZS+vr/
-SQNkhhhQFosZbvKp
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-            </ds:KeyInfo>
-
-        </KeyDescriptor>
-        <KeyDescriptor use="encryption">
-            <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-MIIFRzCCAy+gAwIBAgIUHWtZUtNwHkIdfqv6JaH+SnTXRmAwDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAwwXd2VibG9naW4tdGVzdC12NC5rYXUuc2UwHhcNMjIwNjIx
-MDgzMTU0WhcNNDIwNjIxMDgzMTU0WjAiMSAwHgYDVQQDDBd3ZWJsb2dpbi10ZXN0
-LXY0LmthdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALV2mu+h
-sBzA8+KNWnFAJh7vi08Rr6KU8NyLyHWK+2Tk3gWmtQLS18kMxlRlRsmxX6t2MEI2
-2OzOgli/6gLbspMlhd2bZSbHz5efqUIYjO832RFIfuQkPKeEYkevx8XdO9S5tjpq
-sY7VOgq6rPfg4DKBTGP8uyXZiAZLjl9rHLYtmKSM0k71eqVTWbsYXQcFO+G6CaAl
-y4ZVpOpWJbhA6tdnER9g2PwQpCyQ+7pTZF43bESnEzEd8aO9dPZMI+UVUjkQ1Vo2
-LUhjnMCnEB3DWtlDf47QVTv2hNNg+8iM3Ux27HJBCDnMcT/uNKVI/0Gp6kuqK6sN
-teelzsz9flmVZ9/gunguw+vV99Gcq+eA7CRXh5gROQceXmk56LSSGzEhAu6BYEka
-vdkerv0N3sBLY7tUsWxynIi38PfAkdKa5HuY83vPNPspZd3iaFSF6PYAcsAKOCV8
-FxaMf5pG75kJpysrKAINJsCIdrui7mR8JfC2tqAj+DV8Jsdm/zquhTwLVc7uWbTB
-Scc9g9oNyJFvFxiJasI98Qhv0wv95E3v8UGHufNhseYBuAlqnmMUBwSj82YwyE9e
-DLdDkR5D2WMJMkKOn531lH0QzhmFULXpCbhedGAnVeRdyb6weqZWsQ7C6D2Urcy6
-GvIE5tvUfCNXEwvQ2S5vU4fnRa860GBoPherAgMBAAGjdTBzMB0GA1UdDgQWBBTH
-OGGY2vifqXvOkoK8au7N2HijVDBSBgNVHREESzBJghd3ZWJsb2dpbi10ZXN0LXY0
-LmthdS5zZYYuaHR0cHM6Ly93ZWJsb2dpbi10ZXN0LXY0LmthdS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAgEAEK0e6L4CTdhKDEsKHy3IOLUs9bP4
-9ohfZZAJhWTTZWy9ULrcDl//zfeCDXMZpE3061skhzEcoMV5rs2ZerHwu2zL0Gw0
-TWnSPFc0B9y2tO21WIQ3OB3Y9xpTMtGHyVJEYbmQYq43KjBkBbuMhM8IjPy+BfO7
-tM/F+uJxDGwtC32zLLF6TtgTu7WxE2aAw6GDYv71zKR5YJubn4nMUSQ/QfGIUGAQ
-r2EjQWOnMW/BHN9IyISas29RTZ3/5A0zLaHR+Ptjs7NEe6TPiVnhuFjMPIrLZ6dX
-iHGL+P76mi1kdoqrzhjFoo5KwMyvInPKTG14mtb2Z2IKon0b2eorxmZXJoNiRzZO
-vNjfgxqkYxGJiTRmlcGldW3jY0vG7ogasnGbvXxwvWXpSb2AE2F+iBpOg9qptbp4
-v3kKn0z0sOOvxAUpT3Nevw9ZuATydoyDyaIyV/qyuHbWN3AUhREwM3pygg6TsV22
-gnrCoE/QqjNbPiwGgHfiAZ2WmZdI96M5p6l43jHexXSwQB+clQtC8qhsGSQqIl0A
-ciNZ3H3meQ+c7qoHb0p50dkBYGi5d/Dlr+MBVCtF8gh/sqvMfwJ1d5lBad4IF7IS
-sGr7Vpsw+kPCOPt1Qsx21X5yhJQCl4Dbv0N54LzOKGFbQU7wcNOvKOPuw1JSVmZX
-YgmmVKJz7UoRoFo=
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-            </ds:KeyInfo>
-
-        </KeyDescriptor>
-
-        -->
-  <!--<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test-v4.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>-->
-  <!--
-        -->
-  <!--<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test-v4.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>-->
-  <!--
-        -->
-  <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above-->
-  <!--
-
-    </AttributeAuthorityDescriptor>-->
   <md:Organization>
     <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
diff --git a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
index a5dbea58..de24da3b 100644
--- a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
@@ -5,22 +5,22 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al3</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://weblogin-test.kau.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://weblogin-test.kau.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
+    <md:Extensions>
       <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Karlstads universitet test</mdui:DisplayName>
@@ -48,8 +48,8 @@
         <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -74,8 +74,8 @@ fCvevJT42mGDX9mPl/QB
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -100,8 +100,8 @@ yuEBUW3NO/r+NDLDCkwM7Q==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -126,41 +126,41 @@ tcbcOrD8hYtnkJ0VE3Ns
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">KAU</OrganizationName>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.kau.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.kau.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>mailto:2525@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Incident Response Team</GivenName>
-    <EmailAddress>mailto:irt@kau.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test.kau.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">KAU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.kau.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.kau.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Karlstad University</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Karlstad University</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Karlstad University</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 54 700 2525</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
index 63154476..42908e8b 100644
--- a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
@@ -4,19 +4,19 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-02-15T13:03:53Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://weblogin.smhi.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://weblogin.smhi.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">smhi.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">SMHI</mdui:DisplayName>
@@ -34,8 +34,8 @@
         <mdui:IPHint>2001:67c:274::/48</mdui:IPHint>
         <mdui:GeolocationHint>geo:58.5811180,16.1450240</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -74,8 +74,8 @@ plAt6jVs+phnnWN7Vk5umlo0lIeunmSCwNc6lLO9OzNE
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -114,58 +114,58 @@ kIE+WHmcqr7ZfEfWi17pJAil+nNWp+hZpUw566AbqjWq
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.smhi.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SMHI</OrganizationName>
-    <OrganizationName xml:lang="sv">SMHI</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SMHI</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">SMHI</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.smhi.se</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.smhi.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>SMHI</Company>
-    <SurName>Sakib Kicic</SurName>
-    <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
-    <TelephoneNumber>+46114958033</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>SMHI</Company>
-    <SurName>Peter Magnusson</SurName>
-    <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
-    <TelephoneNumber>+46114958547</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>SMHI</Company>
-    <SurName>Sakib Kicic</SurName>
-    <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
-    <TelephoneNumber>+46114958033</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>SMHI</Company>
-    <SurName>Peter Magnusson</SurName>
-    <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
-    <TelephoneNumber>+46114958547</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>SMHI</Company>
-    <SurName>Sakib Kicic</SurName>
-    <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
-    <TelephoneNumber>+46114958033</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>SMHI</Company>
-    <SurName>Peter Magnusson</SurName>
-    <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
-    <TelephoneNumber>+46114958547</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.smhi.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SMHI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SMHI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SMHI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">SMHI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.smhi.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.smhi.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>SMHI</md:Company>
+    <md:SurName>Sakib Kicic</md:SurName>
+    <md:EmailAddress>mailto:sakib.kicic@smhi.se</md:EmailAddress>
+    <md:TelephoneNumber>+46114958033</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>SMHI</md:Company>
+    <md:SurName>Peter Magnusson</md:SurName>
+    <md:EmailAddress>mailto:peter.magnusson@smhi.se</md:EmailAddress>
+    <md:TelephoneNumber>+46114958547</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SMHI</md:Company>
+    <md:SurName>Sakib Kicic</md:SurName>
+    <md:EmailAddress>mailto:sakib.kicic@smhi.se</md:EmailAddress>
+    <md:TelephoneNumber>+46114958033</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SMHI</md:Company>
+    <md:SurName>Peter Magnusson</md:SurName>
+    <md:EmailAddress>mailto:peter.magnusson@smhi.se</md:EmailAddress>
+    <md:TelephoneNumber>+46114958547</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SMHI</md:Company>
+    <md:SurName>Sakib Kicic</md:SurName>
+    <md:EmailAddress>mailto:sakib.kicic@smhi.se</md:EmailAddress>
+    <md:TelephoneNumber>+46114958033</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SMHI</md:Company>
+    <md:SurName>Peter Magnusson</md:SurName>
+    <md:EmailAddress>mailto:peter.magnusson@smhi.se</md:EmailAddress>
+    <md:TelephoneNumber>+46114958547</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
index f153ab8a..ac06d3ca 100644
--- a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
@@ -47,7 +47,6 @@
         <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -142,7 +141,6 @@ dqPteAxhBzLEflg+
     <md:Extensions>
       <shibmd:Scope regexp="false">test.uu.se</shibmd:Scope>
     </md:Extensions>
-    <!-- First signing certificate is BackChannel, the Second is FrontChannel -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
diff --git a/swamid-2.0/webwork.math.su.se-shibboleth.xml b/swamid-2.0/webwork.math.su.se-shibboleth.xml
index 81b4a5db..70c5fff6 100644
--- a/swamid-2.0/webwork.math.su.se-shibboleth.xml
+++ b/swamid-2.0/webwork.math.su.se-shibboleth.xml
@@ -5,8 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEtjCCA56gAwIBAgILAQAAAAABFmxsApMwDQYJKoZIhvcNAQEFBQAwXzELMAkG
@@ -37,18 +37,18 @@ gCpBEioqc6VkMW0bz9VxYvA+cMH304mW0PJne3tKFeCSJIG555XOvg3bl8bF0gUr
 x4wDuJ8mbDVyyw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webwork.math.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Tomas</GivenName>
-    <SurName>Ericsson</SurName>
-    <EmailAddress>mailto:te@math.su.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webwork.math.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm university</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.su.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Stockholm university</md:Company>
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Ericsson</md:SurName>
+    <md:EmailAddress>mailto:te@math.su.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/wiki.its.uu.se-shibboleth.xml b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
index cbfd499a..e690c1e0 100644
--- a/swamid-2.0/wiki.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
@@ -49,25 +49,25 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
index b995fe34..3210e46e 100644
--- a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
@@ -49,25 +49,25 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
index dbf6d77e..1a7fabba 100644
--- a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
@@ -49,25 +49,25 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml b/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
index 31af7f5d..c466326a 100644
--- a/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
+++ b/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://wireguard.lan.kth.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-08-24T12:14:05Z">
diff --git a/swamid-2.0/wl07089.sigma.local-shibboleth.xml b/swamid-2.0/wl07089.sigma.local-shibboleth.xml
index 54910d11..c2e8f743 100644
--- a/swamid-2.0/wl07089.sigma.local-shibboleth.xml
+++ b/swamid-2.0/wl07089.sigma.local-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://wl07089.sigma.local/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-04-03T09:19:23Z">
diff --git a/swamid-2.0/wp.nordu.net-shibboleth.xml b/swamid-2.0/wp.nordu.net-shibboleth.xml
index 02744cf2..239373df 100644
--- a/swamid-2.0/wp.nordu.net-shibboleth.xml
+++ b/swamid-2.0/wp.nordu.net-shibboleth.xml
@@ -7,11 +7,11 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/test-ds.nordu.net" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/test-ds.nordu.net-dj" index="2"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/skolfederation" index="3"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="4"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="5"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/test-ds.nordu.net" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/test-ds.nordu.net-dj" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/skolfederation" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="4"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wp.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="5"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
index 7f9c6449..8c0d7f17 100644
--- a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
+++ b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
@@ -14,7 +14,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://www.akademiskahogtider.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.akademiskahogtider.se/Shibboleth.sso/DS" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Akademiska högtider</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Commencement ceremonies</mdui:DisplayName>
diff --git a/swamid-2.0/www.alvin-portal.org-shibboleth.xml b/swamid-2.0/www.alvin-portal.org-shibboleth.xml
index f67bdea3..ff80b973 100644
--- a/swamid-2.0/www.alvin-portal.org-shibboleth.xml
+++ b/swamid-2.0/www.alvin-portal.org-shibboleth.xml
@@ -14,7 +14,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://www.alvin-portal.org/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.alvin-portal.org/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Alvin</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Alvin</mdui:DisplayName>
diff --git a/swamid-2.0/www.cambro.umu.se-shibboleth.xml b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
index 8e4d05e7..1ca6ef52 100644
--- a/swamid-2.0/www.cambro.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
@@ -7,7 +7,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://www.cambro.umu.se/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cambro.umu.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/www.egencia.com-auth-v1.xml b/swamid-2.0/www.egencia.com-auth-v1.xml
index 01fe5cdb..caba648e 100644
--- a/swamid-2.0/www.egencia.com-auth-v1.xml
+++ b/swamid-2.0/www.egencia.com-auth-v1.xml
@@ -26,7 +26,6 @@
         <mdui:PrivacyStatementURL xml:lang="sv">http://www.egencia.se/public/se/sv/about-egencia/privacy-policy-en/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <!-- NEW CERT FROM 2022-06-27 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -101,7 +100,6 @@ J3tDkFoC/KdmU0wgE1F2Dw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- OLD CERTS EXPIRE 2022-08-02 -->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
diff --git a/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
index ff489878..9561006f 100644
--- a/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
+++ b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
@@ -4,15 +4,15 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-06-25T11:07:48Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+    <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">itslearning</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">itslearning</mdui:DisplayName>
@@ -23,8 +23,8 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHlTCCBn2gAwIBAgIQP+NA0KNpKn1K1cqIg6opAjANBgkqhkiG9w0BAQsFADCB
@@ -70,8 +70,8 @@ Zit0Oo8ffXXp4SorTdYx5FYi465WzExrKcKOvfxgsCoCpLENi5R4RSDZfMNLe3lN
 BZ3nmbrlzGnKqIX5ScicLNLtdVyxUJXoAA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHlTCCBn2gAwIBAgIQP+NA0KNpKn1K1cqIg6opAjANBgkqhkiG9w0BAQsFADCB
@@ -117,21 +117,21 @@ Zit0Oo8ffXXp4SorTdYx5FYi465WzExrKcKOvfxgsCoCpLENi5R4RSDZfMNLe3lN
 BZ3nmbrlzGnKqIX5ScicLNLtdVyxUJXoAA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/SingleLogoutHandler.aspx"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/eLogin/AssertionConsumerService.aspx"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">itslearning</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">itslearning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://itslearning.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/SingleLogoutHandler.aspx"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/eLogin/AssertionConsumerService.aspx"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">itslearning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">itslearning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://itslearning.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xml:lang="en" contactType="technical">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xml:lang="en" contactType="support">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
index 41736439..51ba91ef 100644
--- a/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
+++ b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
@@ -5,13 +5,13 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">itslearning</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">itslearning</mdui:DisplayName>
@@ -22,8 +22,8 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://itslearning.com/global/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHLjCCBhagAwIBAgIQX7GyA83zvyAJsCXcc941yjANBgkqhkiG9w0BAQsFADCB
@@ -67,8 +67,8 @@ aWOwP8hiEiN95Vx9R6R+Zz4uYg8HFHB4PvQBHEVXajZ7Tf+EX56Ixar+lOI2zzrH
 YKlCAjUJdoo5mc2UCRIvaTQF</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHLjCCBhagAwIBAgIQX7GyA83zvyAJsCXcc941yjANBgkqhkiG9w0BAQsFADCB
@@ -112,26 +112,26 @@ aWOwP8hiEiN95Vx9R6R+Zz4uYg8HFHB4PvQBHEVXajZ7Tf+EX56Ixar+lOI2zzrH
 YKlCAjUJdoo5mc2UCRIvaTQF</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/SingleLogoutHandler.aspx"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/eLogin/AssertionConsumerService.aspx"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">itslearning</ServiceName>
-      <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="eppn" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">itslearning</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">itslearning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://itslearning.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
-    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/SingleLogoutHandler.aspx"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/eLogin/AssertionConsumerService.aspx"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="eppn" 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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">itslearning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">itslearning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://itslearning.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xml:lang="en" contactType="technical">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xml:lang="en" contactType="support">
+    <md:EmailAddress>mailto:support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
index 4d61698f..b5ec10e3 100644
--- a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="www.lararlyftet-validering.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-01-08T07:35:07Z">
diff --git a/swamid-2.0/www.service4mobility.com-mobility_su_se.xml b/swamid-2.0/www.service4mobility.com-mobility_su_se.xml
index d4fbc552..86c680b8 100644
--- a/swamid-2.0/www.service4mobility.com-mobility_su_se.xml
+++ b/swamid-2.0/www.service4mobility.com-mobility_su_se.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/www.sub.su.se.xml b/swamid-2.0/www.sub.su.se.xml
index 061f1639..fd3988b5 100644
--- a/swamid-2.0/www.sub.su.se.xml
+++ b/swamid-2.0/www.sub.su.se.xml
@@ -5,25 +5,25 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIB2TCCAUKgAwIBAgIJAIRfFzH12j9JMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDXd3dy5zdWIuc3Uuc2UwHhcNMDgwNTE0MTQ0NzQ5WhcNMDkwNTE0MTQ0NzQ5WjAYMRYwFAYDVQQDEw13d3cuc3ViLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/9u6s9iHrmj7IvMgSpT8UEzo+Wld9S1QKximd7S6vkIf2arFtvC+Wr04ilfgS6Sp4fOXtGoo9nM7rp6CCdg2RNsrrPUrbs/QkLS5kii2lvQgJ+Q+cJNyJBJhUOgczKcF1nax1roIHKoRMrlRaaeYPv2hh4cVWT23gE5sd+L4pgwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBABcE9tkmR3jTnoWrU5o54zbUKsehvKJozqBrMInvLqwyURkUG2M2jHG+RLtJ0VXBYqtEPbjq0O0kQ6JjAlciMsgv9SVyYryhMjtHZujTalMnRwLF7uWNtR62wY+w53G+7dr9F6cOh4bCXqEN/xs8SoYEymgUBrfKR8SVNxRihZFk</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sub.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Conny</GivenName>
-    <SurName>Richardson</SurName>
-    <EmailAddress>mailto:conny.richardson@sub.su.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sub.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm university</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.su.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Stockholm university</md:Company>
+    <md:GivenName>Conny</md:GivenName>
+    <md:SurName>Richardson</md:SurName>
+    <md:EmailAddress>mailto:conny.richardson@sub.su.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.antagning.se-aws-sp.xml b/swamid-2.0/www.test.antagning.se-aws-sp.xml
index 073bd1e6..dc22ccae 100644
--- a/swamid-2.0/www.test.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.test.antagning.se-aws-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.test.antagning.se/aws-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-27T13:03:02Z">
diff --git a/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
index d6294aaf..9cc5a6cc 100644
--- a/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.test.universityadmissions.se/aws-sp-en">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-27T13:03:02Z">
diff --git a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
index 434c41e1..3664c497 100644
--- a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.universityadmissions.se/aws-sp-en">
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-2.0/www3.genuinetext.com-shibboleth.xml b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
index 499e0f44..c4f5855f 100644
--- a/swamid-2.0/www3.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
@@ -11,8 +11,8 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIB5zCCAVCgAwIBAgIJAKb4Olp/yYCUMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
@@ -28,18 +28,18 @@ B58pVL0eikt969S89t0/DyDnF3edU7pg6Thmom4iElIO4v+l8i8yc7Uxko4lAxi0
 v6nJ+bzAScGjfHk=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.genuinetext.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Genuine Text</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Genuine Text</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.genuinetext.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Knownet AB</Company>
-    <GivenName>Richard</GivenName>
-    <SurName>Bäckman</SurName>
-    <EmailAddress>mailto:rickard@knonet.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.genuinetext.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Genuine Text</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Genuine Text</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.genuinetext.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Knownet AB</md:Company>
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Bäckman</md:SurName>
+    <md:EmailAddress>mailto:rickard@knonet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www4.genuinetext.com-shibboleth.xml b/swamid-2.0/www4.genuinetext.com-shibboleth.xml
index 4952c9ad..3cf68a85 100644
--- a/swamid-2.0/www4.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www4.genuinetext.com-shibboleth.xml
@@ -13,7 +13,7 @@
   </md:Extensions>
   <md: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">
     <md:Extensions>
-      <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://www4.genuinetext.com/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www4.genuinetext.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
index a48d03c8..f0f4459d 100644
--- a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
+++ b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
@@ -11,33 +11,33 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  <md:SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEMjCCAxqgAwIBAgILAQAAAAABE7mOBYIwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3MDcxMjA4MzEzOFoXDTEwMDcxMjA4MzEzOFowYDELMAkGA1UEBhMCR0IxJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE1hbmNoZXN0ZXIxDjAMBgNVBAsTBU1JTUFTMRowGAYDVQQDExF4ZmlyZS5taW1hcy5hYy51azCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnvcQOid24BFRMId4stwyqEmQ3jcU9pqoJI7XkIh4FgYy++lBhGFDVDxkjikhbZKgGk1NONfTGRFHJ6TYRPNNjEjDtu8eTaKVDvvgIiW+E+pbdekmHGp5/1TW30yYUxJv12tBCWSWcHuqQjbnJiM+thHvVT0Rpz269VhaI9dWZY0CAwEAAaOCAXAwggFsMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFFffHJDYEluqeqPk2YaogEb6A+BvMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAcBgNVHREEFTATghF4ZmlyZS5taW1hcy5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAgIGtV9NaiG7yikJKZQgt+GP59EkAWhGYCR8JI5gZU7z6LIyTNLO19MPb2gJiirjUQpFEEh2ZNdiYmYNzf3yZAiVNtv45BOIa+poJbWUr7wXIv48ILhIQ5uTVLXrHofOU/aq3ySpVrLB2DZ1u24GHdxjwgiaKgwk6qntO9zwSeKiK9W2bcNk2mcJh5i7WPsB3RNID/pc4KZmw7T84F0/Ju0PrT4z8ry8286iZRQbZPkTi2D1eqBI52CQIJjUPnEMUJSFLup6kGPGLqtGqqoJNc8mtot4tEQIrqfKu9coHR386P0KAJyUV3PEdkyKcpEpnl4Ky0NDDXLK0BZ4CnMh3/A==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xfire.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">MIMAS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://xfire.mimas.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <SurName>CrossFire Helpdesk</SurName>
-    <EmailAddress>mailto:crossfire@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>david</GivenName>
-    <SurName>Chaplin</SurName>
-    <EmailAddress>mailto:david.chaplin@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Ross</GivenName>
-    <SurName>Macintyre</SurName>
-    <EmailAddress>mailto:Ross.MacIntyre@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xfire.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MIMAS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MIMAS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://xfire.mimas.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>CrossFire Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:crossfire@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>david</md:GivenName>
+    <md:SurName>Chaplin</md:SurName>
+    <md:EmailAddress>mailto:david.chaplin@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ross</md:GivenName>
+    <md:SurName>Macintyre</md:SurName>
+    <md:EmailAddress>mailto:Ross.MacIntyre@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
author	Johan Wassberg <jocar@sunet.se>	2022-08-25 15:10:24 +0200
committer	Johan Wassberg <jocar@sunet.se>	2022-08-25 15:10:24 +0200
commit	bfe5b9dc87edd86e468c6f958298f5b30af5b957 (patch)
tree	febe3c08e7a807fcc20c4191112e6e88a96ee11b /swamid-2.0
parent	83234c31e09a9b3a54e071796e014e86d109871a (diff)