resolves SWAMIDOPS-6257

85 files changed, 864 insertions, 1366 deletions

diff --git a/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml b/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml
index 60ee337e..153c5d71 100644
--- a/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/ab11.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://ab11.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
index 3b2fb739..5f711448 100644
--- a/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://ab11.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ab11.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-dw-idp.xml b/swamid-1.0/at11.ladok.umu.se-dw-idp.xml
index 221c03a6..12279cd4 100644
--- a/swamid-1.0/at11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/at11.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://at11.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml
index a0a11a42..92bf8bf0 100644
--- a/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://at11.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://at11.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml b/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml
new file mode 100644
index 00000000..b298065b
--- /dev/null
+++ b/swamid-1.0/dwidp.nyautb.its.umu.se-dw-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://dwidp.nyautb.its.umu.se/dw-idp"
+                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://dwidp.nyautb.its.umu.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://dwidp.nyautb.its.umu.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://dwidp.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO" />
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBwjCCAWygAwIBAgIJAO7a/CdTVU4WMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2R3aWRwLm55YXV0Yi5pdHMudW11LnNlMB4XDTExMDMxNjEzMTUyOVoXDTIxMDMxMzEzMTUyOVowIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAqr6vIktdC0jJ4t4CN9wODUtVE6JlaIlPS38vXhL1vDQK5LTEusDajuMOQfSLQ2yNZCd+8lpWhwxUHu72bmICiQIDAQABo4GEMIGBMB0GA1UdDgQWBBQvKsJcoloo6k4+SQ9+gvCWJQMJKDBSBgNVHSMESzBJgBQvKsJcoloo6k4+SQ9+gvCWJQMJKKEmpCQwIjEgMB4GA1UEAxMXZHdpZHAubnlhdXRiLml0cy51bXUuc2WCCQDu2vwnU1VOFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAZvITCL2juOmEZLN6U5xSBLTgvtfvdxjFYl0K0o6GysJJ/NIBz5w7Yg3RFWaH2DTYakROB6T6gurAGCHMCNXeLQ==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://dwidp.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://dwidp.nyautb.its.umu.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>
+    
+</EntityDescriptor>    
diff --git a/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml b/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
index 0550a3f4..b7207469 100644
--- a/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://dwidp.testc.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testc.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.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://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml b/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
index e405addb..4cff8f30 100644
--- a/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://dwidp.testd.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.testd.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.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://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml b/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml
index 4901b91d..6c45305f 100644
--- a/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://ft11.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
index c9df8915..5c3c5cd2 100644
--- a/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://ft11.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft11.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml b/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml
index 21a0c54a..e6a0ddcf 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://hubbletest.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBwjCCAWygAwIBAgIJANLq4OZpe55MMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRl
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/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://hubbletest.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hubbletest.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBwjCCAWygAwIBAgIJANLq4OZpe55MMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRl
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://hubbletest.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
index 7e9f35f0..7c627a87 100644
--- a/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/hubbletest.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://hubbletest.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hubbletest.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRl
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/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://hubbletest.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hubbletest.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBwjCCAWygAwIBAgIJAOMOwtcsvBdRMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2h1YmJsZXRl
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://hubbletest.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-dw-idp.xml b/swamid-1.0/it11.ladok.umu.se-dw-idp.xml
index 7e15e626..195cd70d 100644
--- a/swamid-1.0/it11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/it11.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://it11.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml
index 72b0b447..0c301aaf 100644
--- a/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://it11.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://it11.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/ladok-test.su.se.xml b/swamid-1.0/ladok-test.su.se.xml
index 58dca87a..80411149 100644
--- a/swamid-1.0/ladok-test.su.se.xml
+++ b/swamid-1.0/ladok-test.su.se.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok-test.su.se/Shibboleth.sso">
 
   <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">
@@ -74,4 +74,4 @@ fPPBQCZRQrV5zV0+mNOLgZEjYh4zXLJOA4dDFYq2gg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok.su.se.xml b/swamid-1.0/ladok.su.se.xml
index e6d29063..b275d123 100644
--- a/swamid-1.0/ladok.su.se.xml
+++ b/swamid-1.0/ladok.su.se.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok.su.se/Shibboleth.sso">
 
   <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">
@@ -74,4 +74,4 @@ R3H6+4G4tQJixe4WRSG0z0Z1inVFppE5WqimH/Cp4Q==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/lingon.ladok.umu.se.xml b/swamid-1.0/lingon.ladok.umu.se.xml
index 4454d070..c88d8138 100644
--- a/swamid-1.0/lingon.ladok.umu.se.xml
+++ b/swamid-1.0/lingon.ladok.umu.se.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <md:EntityDescriptor  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://lingon.ladok.umu.se:8087/sp.xml">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://lingon.ladok.umu.se:8087/sp.xml">
         <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
             <md:KeyDescriptor>
                 <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml b/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml
index 04956fc2..1d63f489 100644
--- a/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nb11.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
index 69f037dd..12275f91 100644
--- a/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nb11.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb11.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml
index 1740aa2c..5a91fb7a 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-00.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
index 4131fb6e..50664313 100644
--- a/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-00.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-00.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJhfool0tOVlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml
index 5a0b2e15..f27e34c2 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-01.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
index 0e487e47..58c7f0b0 100644
--- a/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-01.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-01.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml
index f06c9c22..2e2c7aaa 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-02.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
index c454002f..f66acdc4 100644
--- a/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-02.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-02.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml
index 11a380f9..a6086c01 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-03.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">vhs.se</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
index 3b467bc7..7d0c46f6 100644
--- a/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-03.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-03.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml
index 7bafe764..bade67e8 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-04.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
index c1056999..e78bfab2 100644
--- a/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-04.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-04.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml
index 9daa35c9..4b4a937d 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-05.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
index 3f9a8b5a..21c417e8 100644
--- a/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-05.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-05.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml
index b2f060eb..099323b2 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-06.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
index bac42759..1540f2d9 100644
--- a/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-06.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-06.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml
index 014ff826..29640852 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-07.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
index caaeb03c..761608c2 100644
--- a/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-07.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-07.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml
index 443f9cbe..e6b9753c 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-08.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml
index 2d355296..baa363c0 100644
--- a/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-08.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-08.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-08.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAJ4Wlqm4ZWTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/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://nya-08.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJ4Wlqm4ZWTbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-08.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml
index 15cd8954..e619125c 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-09.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
index fd3789e8..174104f2 100644
--- a/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-09.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-09.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml
index ee1978fd..56c7bc29 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-10.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
index 199df928..62eb2512 100644
--- a/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-10.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-10.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml
index 991d5ad8..2ba7519c 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-11.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAOD1v94MfUg7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/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://nya-11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAOD1v94MfUg7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml
index 1d649ade..0c0e3ac2 100644
--- a/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-11.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-11.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAKNu6sSUB8iCMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/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://nya-11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAKNu6sSUB8iCMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml
index 2eae7888..ee8ecfaf 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-12.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAM5iqAQferc+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/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://nya-12.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-12.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAM5iqAQferc+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-12.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml
index 2c2c77e5..49e49bc5 100644
--- a/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-12.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-12.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAOiPu5Yiq3ItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/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://nya-12.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-12.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAOiPu5Yiq3ItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMi5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-12.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml
index cde9c97b..c1265c7e 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-13.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAMcAzXq0glwMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/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://nya-13.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-13.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAMcAzXq0glwMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-13.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml
index 66a1700a..f6a8f176 100644
--- a/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-13.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-13.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAPWvSRoLpY6pMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/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://nya-13.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-13.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPWvSRoLpY6pMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMy5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-13.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml
index 39be27a1..35613e3c 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-14.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAOhZAAB6dbhUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/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://nya-14.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-14.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAOhZAAB6dbhUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-14.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml
index 11004098..64ef2bcc 100644
--- a/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-14.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-14.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJANdvOCmSmyJRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/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://nya-14.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-14.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJANdvOCmSmyJRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNC5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-14.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml
index 6eaabe73..93d898e9 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-15.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAJ5EIPWZsBq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/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://nya-15.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-15.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJ5EIPWZsBq4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-15.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml
index e192242c..d82e6995 100644
--- a/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://nya-15.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nya-15.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBtDCCAV6gAwIBAgIJAP6Q22y7RrN3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/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://nya-15.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-15.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAP6Q22y7RrN3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNS5s
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://nya-15.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
index 53ad2c29..30acf7b4 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
index f3eddfa2..7cb4c972 100644
--- a/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
index 9bb4bfbf..93885bc0 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
index 0f5048c6..d8978dd3 100644
--- a/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
index 8b208b8d..55cca910 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
index a9bd04f5..5882a150 100644
--- a/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
index 3ecc9af6..cc6da638 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
index 7360a057..15301457 100644
--- a/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
index 41eba6c3..a5e1292c 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
index 1306ce15..ce176487 100644
--- a/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
index e7829279..dbf8d7f8 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAJNR7IcQKM+XMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
index bf572f77..3a0885c9 100644
--- a/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-21.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAOc/VS8sqcwNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
index 9ea005b3..a0d53ab4 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAM58CxL5RU/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
index f419483c..8d96b129 100644
--- a/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-22.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAIUGSAqVXvGSMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMi5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
index c027b8a0..b92e8add 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
index db034e2c..0d4ef41a 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAKQB/2+1sGqaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
index e9eda611..cfc814ed 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAJBlo931O0kDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
index 5f0a9284..89b1de8e 100644
--- a/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-24.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAIYa0D/uvu1VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
index c8c39c48..e77b8b88 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAK7c8my5ph+oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
index c85ef5fb..2ce38a2c 100644
--- a/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-25.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAPmPWwhZBr5bMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
index 1110db41..95c4d5db 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAJrjFsP2UlpEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
index 18fc1cd0..d265a2fb 100644
--- a/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-26.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAM4bezV2IpuzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNi5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
index bd3f4320..4bba4d0b 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJANYI7Xy4b7OiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
index 2d89e9ed..16730408 100644
--- a/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-27.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAL53MgwuVHeVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yNy5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
index ae206f68..e86aff49 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAJR1DnqzCZWWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
index b5119e3b..33cd356a 100644
--- a/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-28.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJALG8GCbbKR3tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
index d5c72b2c..19e99e18 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAOWhs0Zclv2xMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
index c5da2ab8..819e5a8f 100644
--- a/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-29.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAM/Q+hrMe4RBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yOS5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
index b44f99cb..22a73df0 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-dw-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAOACtXKgbo9wMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
index 84af9079..a25ef6c9 100644
--- a/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-30.ladok.umu.se-shibboleth-idp.xml
@@ -4,7 +4,7 @@
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -36,7 +36,7 @@ MIIBtDCCAV6gAwIBAgIJAIi5L+Ds61H7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0zMC5s
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..f93baab2
--- /dev/null
+++ b/swamid-1.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://shibboleth.nyautb.its.umu.se/shibboleth-idp"
+                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://shibboleth.nyautb.its.umu.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://shibboleth.nyautb.its.umu.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://shibboleth.nyautb.its.umu.se/idp/profile/SAML2/Redirect/SSO" />
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB0TCCAXugAwIBAgIJAJ9F6rr4z9omMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2UwHhcNMTEwMzE2MTE0NjEwWhcNMjEwMzEzMTE0NjEwWjAnMSUwIwYDVQQDExxzaGliYm9sZXRoLm55YXV0Yi5pdHMudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALaTqFBp83W6s/LcGCoWG9+EfOp7iwEilGRgEGQ0nxgiHVF+h2/p3BW+GrU6VtEigTQ3Eu+TsOHPiMlDdXiuh9cCAwEAAaOBiTCBhjAdBgNVHQ4EFgQU689gwNggzN7QkN1e96PPQNL7uVEwVwYDVR0jBFAwToAU689gwNggzN7QkN1e96PPQNL7uVGhK6QpMCcxJTAjBgNVBAMTHHNoaWJib2xldGgubnlhdXRiLml0cy51bXUuc2WCCQCfReq6+M/aJjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAgm2Dj1PoYSqR0wbScZ4HhNScqWvBQ4a/ljd+XkrZKUHhwzQCR5IePCyv3N6zKRykQDLKqNkJls8rlEnDam2cuQ==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://shibboleth.nyautb.its.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://shibboleth.nyautb.its.umu.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>
+    
+</EntityDescriptor>    
diff --git a/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
index e6e96b59..49c4c397 100644
--- a/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://shibboleth.testc.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testc.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.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://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
index 204fa703..5c916d83 100644
--- a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.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://shibboleth.testd.ladok.umu.se:444/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml b/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml
index 020135dc..ae67a65e 100644
--- a/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-dw-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://wb11.ladok.umu.se/dw-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/dw-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
index 094a0999..1f0bfc70 100644
--- a/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
@@ -1,13 +1,10 @@
-<EntityDescriptor entityID="https://wb11.ladok.umu.se/shibboleth-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://wb11.ladok.umu.se/shibboleth-idp">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -20,34 +17,26 @@ MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
         <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+            <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
         </Extensions>
 
         <KeyDescriptor>
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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>
     
-</EntityDescriptor>    
+</EntityDescriptor>