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

46 files changed, 154 insertions, 154 deletions

diff --git a/metadata/swamid-2.0/account-idac.ki.se-shibboleth.xml b/metadata/swamid-2.0/account-idac.ki.se-shibboleth.xml
index 078f7d84..9897b97d 100644
--- a/metadata/swamid-2.0/account-idac.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/account-idac.ki.se-shibboleth.xml
@@ -128,7 +128,7 @@ kSL+CA/rbpXwRm3nHNg1rnjc3bw7VZn6mPa66U0FisLPsrkcuYS+AZAdA0fO02bL
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/account.tst.ki.se-shibboleth.xml b/metadata/swamid-2.0/account.tst.ki.se-shibboleth.xml
index 9fa568e7..77c645d4 100644
--- a/metadata/swamid-2.0/account.tst.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/account.tst.ki.se-shibboleth.xml
@@ -130,7 +130,7 @@ HfEtdyWoym5tQj7qZhcgcrOVZoMO+28u3cdTVFVKGNHxRzM56vgGvJL1jIQe18D+
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/ams.ki.se-shibboleth.xml b/metadata/swamid-2.0/ams.ki.se-shibboleth.xml
index 52d7af8e..5e61363b 100644
--- a/metadata/swamid-2.0/ams.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ams.ki.se-shibboleth.xml
@@ -122,12 +122,12 @@ uA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ams.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska Institut</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska Institut</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institut</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institut</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.ki.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">www.ki.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:technicalsupport@a-tune.com</md:EmailAddress>
diff --git a/metadata/swamid-2.0/beta-kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/beta-kib.ki.se-shibboleth.xml
index 94b3e72c..e93b675f 100644
--- a/metadata/swamid-2.0/beta-kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/beta-kib.ki.se-shibboleth.xml
@@ -99,12 +99,12 @@ wMoVHI38IVm4l3m0Iyq27Q==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta-kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska University Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska University Library</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://kib.ki.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://kib.ki.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>studentit</md:GivenName>
diff --git a/metadata/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
index 379c27a7..06f0fd1e 100644
--- a/metadata/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
@@ -106,12 +106,12 @@ zn8Uq6fIUHLfP4vxCjJIGmGoF4J/bPabGTzBrQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookings-stage.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska University Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska University Library</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://kib.ki.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://kib.ki.se/en</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>IT-support</md:SurName>
diff --git a/metadata/swamid-2.0/bookings.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
index 5881918c..5cdb3520 100644
--- a/metadata/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
@@ -100,12 +100,12 @@ zn8Uq6fIUHLfP4vxCjJIGmGoF4J/bPabGTzBrQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookings.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska University Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska University Library</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://kib.ki.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://kib.ki.se/en</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>IT-support</md:SurName>
diff --git a/metadata/swamid-2.0/idportal-test.slu.se-sp.xml b/metadata/swamid-2.0/idportal-test.slu.se-sp.xml
index e789514f..5bc71303 100644
--- a/metadata/swamid-2.0/idportal-test.slu.se-sp.xml
+++ b/metadata/swamid-2.0/idportal-test.slu.se-sp.xml
@@ -54,8 +54,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">SLU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SLU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/idportal.slu.se-sp.xml b/metadata/swamid-2.0/idportal.slu.se-sp.xml
index 767cf7c3..39532089 100644
--- a/metadata/swamid-2.0/idportal.slu.se-sp.xml
+++ b/metadata/swamid-2.0/idportal.slu.se-sp.xml
@@ -54,8 +54,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">SLU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SLU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/idportal.test.ki.se-shibboleth.xml b/metadata/swamid-2.0/idportal.test.ki.se-shibboleth.xml
index 14137bd9..43896b00 100644
--- a/metadata/swamid-2.0/idportal.test.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/idportal.test.ki.se-shibboleth.xml
@@ -135,7 +135,7 @@ gIPKD9Y1PGRtHQCuKA3wiDl5gMSk8Kahq31M7Vw1ZrNaF4GXwybZlA==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml
index 577a73b4..cc6b4ae4 100644
--- a/metadata/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml
@@ -99,12 +99,12 @@ cPKcXcT7ka5dCHC5ASHoyXpoVIkPqrj/6v+O06V5wukb0JgCCR3YSp6XTsSqZVBV
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kib-stage2.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska University Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska University Library</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://kib.ki.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://kib.ki.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>Student IT</md:SurName>
diff --git a/metadata/swamid-2.0/login.sto3.safespring.com-shibboleth.xml b/metadata/swamid-2.0/login.sto3.safespring.com-shibboleth.xml
index f1d10cf2..4bfb2253 100644
--- a/metadata/swamid-2.0/login.sto3.safespring.com-shibboleth.xml
+++ b/metadata/swamid-2.0/login.sto3.safespring.com-shibboleth.xml
@@ -88,9 +88,9 @@
     <md:AssertionConsumerService Location="https://login.sto3.safespring.com:5000/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Safespring</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blue Safespring AB</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Blue Safespring AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Blue Safespring AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Safespring</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Safespring</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.safespring.com</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.safespring.com</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/moodle.med.lu.se-shibboleth.xml b/metadata/swamid-2.0/moodle.med.lu.se-shibboleth.xml
index ed404be1..5080b241 100644
--- a/metadata/swamid-2.0/moodle.med.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/moodle.med.lu.se-shibboleth.xml
@@ -88,11 +88,11 @@ cl8xMXbSYMX3EVI03snOJy2ugpU+</ds:X509Certificate>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lunds Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Faculty of Medicine, Lund University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Medicinska Fakulteten, Lunds Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.medicin.lu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.medicin.lu.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:magnus.hovde@med.lu.se</md:EmailAddress>
diff --git a/metadata/swamid-2.0/mystery.cs.lth.se-shibboleth.xml b/metadata/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
index 620ba833..8eaf64d1 100644
--- a/metadata/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
@@ -102,12 +102,12 @@ dky/L3kUg/jrdGgTRg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm52.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="12"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">LU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">PLDetective</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PLDetective</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.lu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.lunduniversity.lu.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Christoph</md:GivenName>
diff --git a/metadata/swamid-2.0/ni.nordu.net-saml2-metadata-.xml b/metadata/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
index 4590b7f9..5bbd551b 100644
--- a/metadata/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
@@ -56,12 +56,12 @@ lHFHSZWekFvXeqCFNLjtWOiByw==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">NORDUnet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NORDUnet A/S</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">NORDUnet A/S</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.nordu.net</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.nordu.net</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.nordu.net</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
diff --git a/metadata/swamid-2.0/play.ki.se.xml b/metadata/swamid-2.0/play.ki.se.xml
index bae3c9f6..7bcf58a9 100644
--- a/metadata/swamid-2.0/play.ki.se.xml
+++ b/metadata/swamid-2.0/play.ki.se.xml
@@ -46,7 +46,7 @@
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
index e9d0422d..4f8d85cb 100644
--- a/metadata/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
@@ -87,12 +87,12 @@ CD7PLZk/IkwF0hNDcLbY51g4UEz40tQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="sv">Ricoh Sverige AB</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Ricoh Sweden AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ricoh Sweden AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ricoh Sverige AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ricoh Sweden AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Ricoh Sweden AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ricoh.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.ricoh.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.ricoh.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.ricoh-europe.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Ricoh</md:GivenName>
diff --git a/metadata/swamid-2.0/portalki.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portalki.onricoh.se-shibboleth.xml
index d47576cf..bfb5ddce 100644
--- a/metadata/swamid-2.0/portalki.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portalki.onricoh.se-shibboleth.xml
@@ -87,7 +87,7 @@ GX6rbVM3C9aRnjhlQqEgw3FxEoxqmBhzUA5M71jvOII=</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portalki.onricoh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ricoh Sweden AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ricoh Sverige AB</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Ricoh Sweden AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ricoh Sverige AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ricoh Sweden AB</md:OrganizationDisplayName>
diff --git a/metadata/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
index 29b7cb32..c740e111 100644
--- a/metadata/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
@@ -88,7 +88,7 @@ ExFT9QQ3amEjepGH1v7O88qG5RbLnOwLcWiIsGK2eOWIaV23z2k=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portalmiun.onricoh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ricoh Sweden AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ricoh Sverige AB</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Ricoh Sweden AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ricoh Sverige AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ricoh Sweden AB</md:OrganizationDisplayName>
diff --git a/metadata/swamid-2.0/portaluu.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
index 0fbd7473..b9dc0579 100644
--- a/metadata/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
@@ -88,7 +88,7 @@ p0owXoY2wveIE0oSDmHcviu3XXSHBjm7ySH629S4HQc=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portaluu.onricoh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ricoh Sweden AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ricoh Sverige AB</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Ricoh Sweden AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ricoh Sverige AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ricoh Sweden AB</md:OrganizationDisplayName>
diff --git a/metadata/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml
index 8a0d6233..d0f8382b 100644
--- a/metadata/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml
@@ -100,12 +100,12 @@ eW+R64ErX+eC6ElZ0dpiw8a7sg4Dat1GdoifWpb4gY2YG23nZG5TlX+aYw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://primo-latefee.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska University Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet University Library</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet Universitetsbiblioteket</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://kib.ki.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://kib.ki.se/en</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>studentit</md:GivenName>
diff --git a/metadata/swamid-2.0/rb.lbic.lu.se-.xml b/metadata/swamid-2.0/rb.lbic.lu.se-.xml
index 9b27442d..39bc061c 100644
--- a/metadata/swamid-2.0/rb.lbic.lu.se-.xml
+++ b/metadata/swamid-2.0/rb.lbic.lu.se-.xml
@@ -68,10 +68,10 @@ qydeSHsJ7nth74Mp8QxQIFFWt4ojszc=</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lund university Bioimaging Centre</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Lund university Bioimaging Centre</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lbic.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lbic.lu.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>LBIC IT support</md:GivenName>
diff --git a/metadata/swamid-2.0/redcap.ki.se-shibboleth.xml b/metadata/swamid-2.0/redcap.ki.se-shibboleth.xml
index 4d67bc03..e8e6d4ff 100644
--- a/metadata/swamid-2.0/redcap.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/redcap.ki.se-shibboleth.xml
@@ -98,8 +98,8 @@ DOBgIJcDatI=
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ki.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
diff --git a/metadata/swamid-2.0/redcap.tst.ki.se-shibboleth.xml b/metadata/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
index 1a152b5f..5a7f40fc 100644
--- a/metadata/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
@@ -94,8 +94,8 @@ Gve8ozn6yxplJyB0jvZae8kfE4LtXr4adWlYG2E=
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ki.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
diff --git a/metadata/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml
index 4aaee688..9addd2c4 100644
--- a/metadata/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml
@@ -107,12 +107,12 @@ Yx3RQL32z/1dFj4mOtsWNQ/dgUvPrm9pgmDgW7O1TjpnNaXrkCL2gmg06iCQNgDY
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-hh-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="9"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">qs-unisolution</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">qs-unisolution</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">qs-unisolution</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">qs-unisolution</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.qs-unisolution.com/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.qs.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.qs.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Morgane</md:GivenName>
diff --git a/metadata/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
index 53c67c67..0a72d47d 100644
--- a/metadata/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
@@ -92,9 +92,9 @@ JykzbzC8EuJsHuJGeMiL
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-kau-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="9"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">qs-unisolution</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">qs-unisolution</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.qs.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>International Office</md:SurName>
diff --git a/metadata/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
index 5b8f0637..feb2444f 100644
--- a/metadata/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
@@ -88,8 +88,8 @@ Y9eh6IC/VMIOycQRbsG7v1Phh4EdA32rcxMH9ZmP2PfN5d7D9SYIsemQGoTY5nw/
     <md:OrganizationName xml:lang="sv">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.qs.com/solutions/moveon-partnership-mobility-software/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.qs.com/solutions/moveon-partnership-mobility-software/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.qs.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.qs.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Fiona</md:GivenName>
diff --git a/metadata/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
index 7b7c7696..b373bf62 100644
--- a/metadata/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
@@ -108,12 +108,12 @@ cgdctvi9cA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="9"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">qs-unisolution</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">qs-unisolution</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">qs-unisolution</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">qs-unisolution</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.qs-unisolution.com/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">QS QUACQUARELLI SYMONDS LIMITED</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.qs.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.qs.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Fiona</md:GivenName>
diff --git a/metadata/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml
index e6eca306..8899378f 100644
--- a/metadata/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml
@@ -96,12 +96,12 @@ S84xpJu8fiKkWmcKi2vYwsNelGLpMv16jyDufrssTkm8503LuQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shiny-stage.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska Institutionen Universitetsbibliotek</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutionen Universitetsbibliotek</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutionen University Library</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://kib.ki.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://kib.ki.se/en</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>Karolinska Institutionen Universitetsbibliotek</md:Company>
diff --git a/metadata/swamid-2.0/shiny.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/shiny.kib.ki.se-shibboleth.xml
index becbaba9..c6c7f3d2 100644
--- a/metadata/swamid-2.0/shiny.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/shiny.kib.ki.se-shibboleth.xml
@@ -96,12 +96,12 @@ brD/4z8UdFpFRz8rA6gD2xxpJQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shiny.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska University Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska universitetsbiblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutionen University Library</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://kib.ki.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://kib.ki.se/en</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>Karolinska Institutionen Universitetsbibliotek</md:Company>
diff --git a/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index b967efff..315bff72 100644
--- a/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -65,11 +65,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Göteborgs universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Department of Swedish, Multilingualism, Language Technology University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutionen för svenska, flerspråkighet och språkteknologi, Göteborgs universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://spraakbanken.gu.se/eng/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Leif-Jöran</md:GivenName>
diff --git a/metadata/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml b/metadata/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
index 9d3aece3..10698f88 100644
--- a/metadata/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
+++ b/metadata/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
@@ -86,9 +86,9 @@
     <md:AssertionConsumerService Location="https://v2.api.sto4.safedc.net:5000/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Safespring</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blue Safespring AB</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Blue Safespring AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Blue Safespring AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Safespring</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Safespring</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.safespring.com</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.safespring.com</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml b/metadata/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
index 44151680..5257fdb0 100644
--- a/metadata/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
+++ b/metadata/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
@@ -88,9 +88,9 @@
     <md:AssertionConsumerService Location="https://v2.dashboard.sto1.safedc.net:5000/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Safespring</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blue Safespring AB</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Blue Safespring AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Blue Safespring AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Safespring</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Safespring</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.safespring.com</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.safespring.com</md:OrganizationURL>
diff --git a/metadata/swamid-edugain/crowd.nordu.net-shibboleth.xml b/metadata/swamid-edugain/crowd.nordu.net-shibboleth.xml
index fd89ad19..122abe54 100644
--- a/metadata/swamid-edugain/crowd.nordu.net-shibboleth.xml
+++ b/metadata/swamid-edugain/crowd.nordu.net-shibboleth.xml
@@ -77,10 +77,10 @@ NfrvWSvloEF2ucdPRsR3nLg2ZOuYu9OY0w==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">NORDUnet A/S</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">NORDUnet A/S</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.nordu.net</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/dashboard.dco.safespring.com-shibboleth.xml b/metadata/swamid-edugain/dashboard.dco.safespring.com-shibboleth.xml
index a06977db..0ccaf705 100644
--- a/metadata/swamid-edugain/dashboard.dco.safespring.com-shibboleth.xml
+++ b/metadata/swamid-edugain/dashboard.dco.safespring.com-shibboleth.xml
@@ -97,7 +97,7 @@
     <md:AssertionConsumerService Location="https://v2.api.dco.safedc.net:5000/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Blue Safespring AB</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Blue Safespring AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Safespring</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Safespring</md:OrganizationDisplayName>
diff --git a/metadata/swamid-edugain/idp-shib.slu.se-idp.xml b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
index f5c944d5..100bea1f 100644
--- a/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
+++ b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
@@ -234,8 +234,8 @@ ffEVzH+iKOe5hd6R</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SLU</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SLU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.slu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.slu.se/en</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/idp.mdh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.mdh.se-idp-shibboleth.xml
index 1b12d253..44ee3196 100644
--- a/metadata/swamid-edugain/idp.mdh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.mdh.se-idp-shibboleth.xml
@@ -196,12 +196,12 @@ gJxaftdRQe7zWKOr0S7Lpm02pTSgD9bTPx1RVDuoyIYO0GGn+CF9ADzfOWR4dtJ9
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">MDU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">MDU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Mälardalen University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Mälardalens universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Mälardalens universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https:///www.mdu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.mdu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.mdu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Mälardalen University</md:Company>
diff --git a/metadata/swamid-edugain/idp.nordu.net-idp-shibboleth.xml b/metadata/swamid-edugain/idp.nordu.net-idp-shibboleth.xml
index 670a6531..4abc56e0 100644
--- a/metadata/swamid-edugain/idp.nordu.net-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.nordu.net-idp-shibboleth.xml
@@ -100,10 +100,10 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">NORDUnet A/S</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">NORDUnet A/S</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.nordu.net</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/login.ki.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.ki.se-idp-shibboleth.xml
index fbfe8647..a148318d 100644
--- a/metadata/swamid-edugain/login.ki.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.ki.se-idp-shibboleth.xml
@@ -215,7 +215,7 @@ BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml b/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
index ba9cbd17..e4058ce3 100644
--- a/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
+++ b/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
@@ -112,8 +112,8 @@ SjR0JMXpw1VGuEcbAipJR5DLZcHmAUL/CnC4H6VMBk3YcWbDMrXBp6lMYBZ+jUMG
   <md:Organization>
     <md:OrganizationName xml:lang="en">Prio Infocenter AB</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Prio Infocenter AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Prio Infocenter AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Prio Infocenter AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.ouriginal.com/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.ouriginal.com/sv/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml b/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
index 8bb2df7d..d0e79eef 100644
--- a/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
+++ b/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
@@ -112,12 +112,12 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Göteborgs universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutionen för svenska, flerspråkighet och språkteknologi, Göteborgs universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Department of Swedish, Multilingualism, Language Technology University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://spraakbanken.gu.se/eng/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Lars</md:GivenName>
diff --git a/metadata/swamid-edugain/sso.kb.se-adfs-services-trust.xml b/metadata/swamid-edugain/sso.kb.se-adfs-services-trust.xml
index 0fa73b35..7376fd59 100644
--- a/metadata/swamid-edugain/sso.kb.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/sso.kb.se-adfs-services-trust.xml
@@ -68,10 +68,10 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">National Library of Sweden</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Kungliga Biblioteket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">KB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.kb.se</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">National Library of Sweden</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.kb.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>National Library of Sweden</md:Company>
diff --git a/metadata/swamid-testing/idp3.mdu.se-idp-shibboleth.xml b/metadata/swamid-testing/idp3.mdu.se-idp-shibboleth.xml
index e14f25de..3a0b28d5 100644
--- a/metadata/swamid-testing/idp3.mdu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp3.mdu.se-idp-shibboleth.xml
@@ -386,11 +386,11 @@ t0BH1/atFD99aRQh3GIAMSe0iL7yvIE=</ds:X509Certificate>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.mdu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">MDU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">MDU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Mälardalen University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Mälardalens universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Mälardalens universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.mdu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https:///www.mdu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.mdu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-testing/idportal-dev.slu.se-sp.xml b/metadata/swamid-testing/idportal-dev.slu.se-sp.xml
index 2fecfefe..e1b94ab1 100644
--- a/metadata/swamid-testing/idportal-dev.slu.se-sp.xml
+++ b/metadata/swamid-testing/idportal-dev.slu.se-sp.xml
@@ -66,8 +66,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">SLU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SLU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
diff --git a/metadata/swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml b/metadata/swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml
index faaa00e1..2ccfbd08 100644
--- a/metadata/swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml
@@ -218,7 +218,7 @@ PwuJvX7it1A9Hed/1ui+iuKIU5An0lBDnCHVuet+nXNF6cg+zCJsVKV2PRrBmRP3
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml b/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
index e962e7ea..14be2b9f 100644
--- a/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
@@ -215,7 +215,7 @@ jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=</ds:X509Certificate
     <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-testing/test.play.gu.se.xml b/metadata/swamid-testing/test.play.gu.se.xml
index cf62dacd..e6b87850 100644
--- a/metadata/swamid-testing/test.play.gu.se.xml
+++ b/metadata/swamid-testing/test.play.gu.se.xml
@@ -42,12 +42,12 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.play.gu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Göteborgs universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:gukonto@gu.se</md:EmailAddress>