Corrected use of OrganizationName and OrganizationDisplayName, more to come.md-2024-02-19-v03

25 files changed, 109 insertions, 109 deletions

diff --git a/metadata/swamid-2.0/aktivera-dev.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/aktivera-dev.su.se-Shibboleth.sso.xml
index a7c2593a..5bbb05b7 100644
--- a/metadata/swamid-2.0/aktivera-dev.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/aktivera-dev.su.se-Shibboleth.sso.xml
@@ -101,12 +101,12 @@ oXLqexbA4XotSpZFrZfGWoE/heuf/mnO7wifWWw8dLAgY6Jrj0s4EUoMAyzRWs5G
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
index d7decd7d..4da4afac 100644
--- a/metadata/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
@@ -113,12 +113,12 @@ UOt6LBw=
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
index a508b1fb..2e295e57 100644
--- a/metadata/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
@@ -113,12 +113,12 @@ QZgdWSo=
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml b/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
index 372bfbe5..67b6a979 100644
--- a/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
+++ b/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
@@ -81,8 +81,8 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bankid-idp.sunet.se/bankid/idp/saml2/post/authn"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Sunet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
index ebbdeab8..2386061b 100644
--- a/metadata/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
@@ -115,11 +115,11 @@ b75rieg7UyfG11PbCBnO1rv+XEghqLYAx/4HdbYol6uBsYcQnCEGPTqSmfqcAbZf
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml
index 6a7f389e..c8e6943f 100644
--- a/metadata/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml
@@ -93,11 +93,11 @@ afS2j4G2fLEwcIN18FCWaT5fjebb</ds:X509Certificate>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml b/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
index 093e61a0..2d0b9f36 100644
--- a/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
+++ b/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
@@ -97,12 +97,12 @@ iC0vZyfVeVSTgXKo/0dTJDsIEdJmRhVoJvYV81GZ1hdj9wxC/UTGWYaQbmBm+sfW
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cuttlefish.pdc.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">PDC KTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">PDC KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Parallelldatorcentrum KTH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PDC Center for High Performance Computing KTH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.pdc.kth.se/sv</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.pdc.kth.se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Royal Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Kungliga Tekniska högskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">KTH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kth.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.kth.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>PDC Support</md:GivenName>
diff --git a/metadata/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml
index 3f54d874..7a30d8fd 100644
--- a/metadata/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml
@@ -101,8 +101,8 @@ Ju3xhw0X2wgXtqPjXoFHDFhr0WOgE96d3RpYkdPUa++HZ+JoEkxawOtQGnueuXvv
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://disp-ci.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml
index 8b9d017c..26a69632 100644
--- a/metadata/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml
@@ -101,12 +101,12 @@ b9Eux1KYpS/jpeRmnBzq8FapmiGVFZiv97Hkxc/zSYg=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://disp-dev.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml
index c614fa5e..e73fc80b 100644
--- a/metadata/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml
@@ -92,12 +92,12 @@ veYY4JI/LVtJ69DDnmV4xSLf9ol7LfYXvwrXPy4Dh1rrOn4=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://disp-test.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholms Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/disp.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp.su.se-Shibboleth.sso.xml
index f637fb70..024196e9 100644
--- a/metadata/swamid-2.0/disp.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp.su.se-Shibboleth.sso.xml
@@ -91,12 +91,12 @@ f1VDftjb1NYsqqV06zANx5VGuOZlrsYsFieWQL2A0Ny0Y+HFISGIShdFp0P7QFin
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://disp.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholms Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/metadata/swamid-2.0/etenta.math.su.se-shibboleth.xml b/metadata/swamid-2.0/etenta.math.su.se-shibboleth.xml
index 351a000f..4ea6369c 100644
--- a/metadata/swamid-2.0/etenta.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/etenta.math.su.se-shibboleth.xml
@@ -108,12 +108,12 @@ QUYfhLzUYuNWskoLQLCXtieByzsjSJGSPQ==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Matematiska institutionen, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Department of mathematics, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.math.su.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.math.su.se/english</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>IT Management</md:GivenName>
diff --git a/metadata/swamid-2.0/kurser.math.su.se-shibboleth.xml b/metadata/swamid-2.0/kurser.math.su.se-shibboleth.xml
index a8b4af18..a69ae938 100644
--- a/metadata/swamid-2.0/kurser.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kurser.math.su.se-shibboleth.xml
@@ -109,12 +109,12 @@ r+TncAEB8Ab193KqbVs9FpIQ120x4uecog==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Matematiska institutionen, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Department of mathematics, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.math.su.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.math.su.se/english</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>IT Management</md:GivenName>
diff --git a/metadata/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml b/metadata/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
index 8ba8bfc3..6bd6edf7 100644
--- a/metadata/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
+++ b/metadata/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
@@ -42,11 +42,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Fysikum, Stockholms Universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.fysik.su.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.fysik.su.se/english/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Alex</md:GivenName>
diff --git a/metadata/swamid-2.0/prep.math.su.se-shibboleth.xml b/metadata/swamid-2.0/prep.math.su.se-shibboleth.xml
index 621024c5..d56a4403 100644
--- a/metadata/swamid-2.0/prep.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/prep.math.su.se-shibboleth.xml
@@ -144,12 +144,12 @@ CbhpbqNPsz3I/+a1r4ELhjSDig==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Matematiska institutionen, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Department of mathematics, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.math.su.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.math.su.se/english</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>IT Management</md:GivenName>
diff --git a/metadata/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml
index 7713cec9..b05946ce 100644
--- a/metadata/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml
@@ -187,10 +187,10 @@ oSebjHEbDyvyCEpSc8AvLUvXcRfIOwzDyipy7dN1zZGqVI4hJEt1jG0Svc9YxHPr</ds:X509Certifi
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/stage.math.su.se-shibboleth.xml b/metadata/swamid-2.0/stage.math.su.se-shibboleth.xml
index 6df7d991..8425feef 100644
--- a/metadata/swamid-2.0/stage.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/stage.math.su.se-shibboleth.xml
@@ -108,12 +108,12 @@ CtTq9Y6Fdin4GnIMTz1z2vKAfUB1mg==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Matematiska institutionen, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Department of mathematics, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.math.su.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.math.su.se/english</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>IT Management</md:GivenName>
diff --git a/metadata/swamid-2.0/utmanande.math.su.se-shibboleth.xml b/metadata/swamid-2.0/utmanande.math.su.se-shibboleth.xml
index 19058ba8..5d21a7f2 100644
--- a/metadata/swamid-2.0/utmanande.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/utmanande.math.su.se-shibboleth.xml
@@ -108,12 +108,12 @@ UWAgYN1/WaIEogIgRbj/RgT6fZue7+m+1tnXfE1qV3/2jA==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Matematiska institutionen, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Department of mathematics, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.math.su.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.math.su.se/english</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>IT Management</md:GivenName>
diff --git a/metadata/swamid-2.0/video.su.se.xml b/metadata/swamid-2.0/video.su.se.xml
index 3bf6e452..8303057c 100644
--- a/metadata/swamid-2.0/video.su.se.xml
+++ b/metadata/swamid-2.0/video.su.se.xml
@@ -43,11 +43,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
diff --git a/metadata/swamid-2.0/wiki.pdc.kth.se.xml b/metadata/swamid-2.0/wiki.pdc.kth.se.xml
index ba57118d..ee315d9a 100644
--- a/metadata/swamid-2.0/wiki.pdc.kth.se.xml
+++ b/metadata/swamid-2.0/wiki.pdc.kth.se.xml
@@ -97,12 +97,12 @@ iC0vZyfVeVSTgXKo/0dTJDsIEdJmRhVoJvYV81GZ1hdj9wxC/UTGWYaQbmBm+sfW
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">PDC KTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">PDC KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Parallelldatorcentrum KTH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PDC Center for High Performance Computing KTH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.pdc.kth.se/sv</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.pdc.kth.se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Royal Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Kungliga Tekniska högskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">KTH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kth.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.kth.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>PDC Support</md:GivenName>
diff --git a/metadata/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml b/metadata/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
index c4db2007..3eae8c64 100644
--- a/metadata/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
+++ b/metadata/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
@@ -78,10 +78,10 @@ es55lJTi6JO0uz/1fmpfswc=
   <md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Fysikum, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Fysikum</md:GivenName>
diff --git a/metadata/swamid-edugain/idp.it.su.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.it.su.se-idp-shibboleth.xml
index 93ce4a14..0479793f 100644
--- a/metadata/swamid-edugain/idp.it.su.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.it.su.se-idp-shibboleth.xml
@@ -75,12 +75,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Stockholm University</md:Company>
diff --git a/metadata/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml b/metadata/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml
index 65140451..ae9027a4 100644
--- a/metadata/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml
@@ -89,12 +89,12 @@ FwgoenLfYvwhMMTrLnihQgG7zjiDK7bJrnONepZURLDmrykmJ9ORWxgAbpttnIPK
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.fysik.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm Univerity</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum, Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Fysikum, Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.fysik.su.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/fysikum/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>Fysikum, Stockholms Universitet</md:SurName>
diff --git a/metadata/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml b/metadata/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
index 6d099cc5..ac77d3e9 100644
--- a/metadata/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
+++ b/metadata/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
@@ -78,12 +78,12 @@ ZvXfxWm8pZrfPFiZV0nY3FZ8Qwz/T1Ne4pdqZV7vR1Wbgetamv0ocA==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcloud.fysik.su.se/swamidproxy/acs/post" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Fysikum</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fysikum</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Fysikum, Stockholms Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://fysik.su.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://fysik.su.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Alex Kastanas</md:GivenName>
diff --git a/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml b/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
index 01918a8c..166c87cd 100644
--- a/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
@@ -75,12 +75,12 @@ i5Njb3NXTdej0Y7FgTe1F/IfGOS4KxKJEG0=</ds:X509Certificate>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet (test)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University (test)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Stockholm University</md:Company>