From 7d8f8036e7017b15d8a8b1c092e65d8d17a70e03 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Wed, 21 Feb 2024 10:29:30 +0100
Subject: Corrected use of OrganizationName and OrganizationDisplayName, more
 to come.

---
 .../akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml      | 2 +-
 .../akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml           | 2 +-
 metadata/swamid-2.0/app.sh.se.xml                                 | 4 ++--
 metadata/swamid-2.0/datalab.humlab.umu.se.xml                     | 6 +++---
 metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml             | 2 +-
 metadata/swamid-2.0/examensansokan.portal.chalmers.se.xml         | 2 +-
 .../swamid-2.0/idp.ciceron.cloud-metadata-system-su_earkiv.xml    | 4 ++--
 metadata/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml       | 6 +++---
 metadata/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml      | 6 +++---
 .../swamid-2.0/kth-ch-psb.alma.exlibrisgroup.com-mng-login.xml    | 2 +-
 metadata/swamid-2.0/kth-ch.alma.exlibrisgroup.com-mng-login.xml   | 2 +-
 metadata/swamid-2.0/myaccount.chalmers.se.xml                     | 2 +-
 metadata/swamid-2.0/passport.lu.se-SAML2-shibboleth.xml           | 2 +-
 metadata/swamid-2.0/play.chalmers.se.xml                          | 2 +-
 metadata/swamid-2.0/play.ju.se.xml                                | 8 ++++----
 metadata/swamid-2.0/play.konstfack.se.xml                         | 6 +++---
 metadata/swamid-2.0/play.mdu.se.xml                               | 4 ++--
 metadata/swamid-2.0/play.umu.se.xml                               | 4 ++--
 metadata/swamid-2.0/play.vr.se.xml                                | 4 ++--
 metadata/swamid-2.0/program.portal.chalmers.se.xml                | 2 +-
 metadata/swamid-2.0/reset.hig.se-shibboleth.xml                   | 2 +-
 metadata/swamid-2.0/sig.idsec.se-shibboleth.xml                   | 2 +-
 metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml                | 2 +-
 metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml               | 2 +-
 ...bbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml | 2 +-
 ...l.v2.ebbot.app-ebbdys6h7km4bq8pcqz2gescorijo2-metadata.xml.xml | 2 +-
 metadata/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml | 2 +-
 metadata/swamid-2.0/test.gdb.vr.se.xml                            | 2 +-
 metadata/swamid-2.0/test.play.vr.se.xml                           | 4 ++--
 metadata/swamid-2.0/visp-demo.humlab.umu.se.xml                   | 2 +-
 metadata/swamid-2.0/visp.humlab.umu.se.xml                        | 2 +-
 metadata/swamid-2.0/www.egencia.com-auth-v1.xml                   | 4 ++--
 metadata/swamid-edugain/account.test.eciu.eu.xml                  | 2 +-
 metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml       | 2 +-
 metadata/swamid-edugain/gdb.vr.se.xml                             | 4 ++--
 metadata/swamid-edugain/idp-shib.slu.se-idp.xml                   | 2 +-
 metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml   | 2 +-
 metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml             | 4 ++--
 metadata/swamid-edugain/idp.vr.se-adfs-services-trust.xml         | 4 ++--
 metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml  | 2 +-
 .../flax.nettst.chalmers.se-adfs-services-trust.xml               | 2 +-
 metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml  | 4 ++--
 42 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/metadata/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml
index 34f82b5f..bdd0ab06 100644
--- a/metadata/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml
@@ -145,7 +145,7 @@ N3TaL36eL8QAIIDX0qq6FGMf5AG8mdJ1Sew/dOXmkw6LgIrjIw==
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Selma at Uppsala University</md:GivenName>
diff --git a/metadata/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml
index 516ff732..8c3015d9 100644
--- a/metadata/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml
@@ -145,7 +145,7 @@ Ke0XYDdP1Yqw/d+BRui3l7D4VWaYig==
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Selma at Uppsala University</md:GivenName>
diff --git a/metadata/swamid-2.0/app.sh.se.xml b/metadata/swamid-2.0/app.sh.se.xml
index 4875a592..f89c0176 100644
--- a/metadata/swamid-2.0/app.sh.se.xml
+++ b/metadata/swamid-2.0/app.sh.se.xml
@@ -73,9 +73,9 @@ WoTviqIqZjlltjraLA==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Södertörns högskola</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Södertörn University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Södertörns högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Södertörn University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sh.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.sh.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/datalab.humlab.umu.se.xml b/metadata/swamid-2.0/datalab.humlab.umu.se.xml
index e11ed5f0..fe4d22cf 100644
--- a/metadata/swamid-2.0/datalab.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/datalab.humlab.umu.se.xml
@@ -42,10 +42,10 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.umu.se</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml b/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
index d01195da..0db805fb 100644
--- a/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
+++ b/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
@@ -105,7 +105,7 @@ fwsIhlKJY1rN5SMDlQ==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/examensansokan.portal.chalmers.se.xml b/metadata/swamid-2.0/examensansokan.portal.chalmers.se.xml
index 32784436..84f20c81 100644
--- a/metadata/swamid-2.0/examensansokan.portal.chalmers.se.xml
+++ b/metadata/swamid-2.0/examensansokan.portal.chalmers.se.xml
@@ -108,7 +108,7 @@ uA==
     <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/idp.ciceron.cloud-metadata-system-su_earkiv.xml b/metadata/swamid-2.0/idp.ciceron.cloud-metadata-system-su_earkiv.xml
index de449ade..6dc7b82a 100644
--- a/metadata/swamid-2.0/idp.ciceron.cloud-metadata-system-su_earkiv.xml
+++ b/metadata/swamid-2.0/idp.ciceron.cloud-metadata-system-su_earkiv.xml
@@ -44,8 +44,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">twoday</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">twoday</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">twoday AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">twoday AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">twoday AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">twoday AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.twoday.com</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
index 29e7a060..d918884c 100644
--- a/metadata/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
@@ -36,9 +36,9 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ex Libris (Germany)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ex Libris (Germany)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.exlibrisgroup.com</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Ex Libris, Part of Clarivate</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ex Libris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://exlibrisgroup.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>Caroline Myrberg</md:SurName>
diff --git a/metadata/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
index c0e98f0e..44153255 100644
--- a/metadata/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
@@ -36,9 +36,9 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ex Libris (Germany)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ex Libris (Germany)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.exlibrisgroup.com</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Ex Libris, Part of Clarivate</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ex Libris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://exlibrisgroup.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>Caroline Myrberg</md:SurName>
diff --git a/metadata/swamid-2.0/kth-ch-psb.alma.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/kth-ch-psb.alma.exlibrisgroup.com-mng-login.xml
index 7fd7dee1..e0b00877 100644
--- a/metadata/swamid-2.0/kth-ch-psb.alma.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/kth-ch-psb.alma.exlibrisgroup.com-mng-login.xml
@@ -28,7 +28,7 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Ex Libris, Part of Clarivate</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ex Libris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.exlibrisgroup.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://exlibrisgroup.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>KTH Biblioteket</md:SurName>
diff --git a/metadata/swamid-2.0/kth-ch.alma.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/kth-ch.alma.exlibrisgroup.com-mng-login.xml
index 4802cbde..8b5497c3 100644
--- a/metadata/swamid-2.0/kth-ch.alma.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/kth-ch.alma.exlibrisgroup.com-mng-login.xml
@@ -28,7 +28,7 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Ex Libris, Part of Clarivate</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ex Libris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.exlibrisgroup.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://exlibrisgroup.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>KTH Biblioteket</md:SurName>
diff --git a/metadata/swamid-2.0/myaccount.chalmers.se.xml b/metadata/swamid-2.0/myaccount.chalmers.se.xml
index b5bcac29..c01285a7 100644
--- a/metadata/swamid-2.0/myaccount.chalmers.se.xml
+++ b/metadata/swamid-2.0/myaccount.chalmers.se.xml
@@ -107,7 +107,7 @@ aSQ0dYQotZuTrHyUrg==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/passport.lu.se-SAML2-shibboleth.xml b/metadata/swamid-2.0/passport.lu.se-SAML2-shibboleth.xml
index 7cc4b089..2bcbd71f 100644
--- a/metadata/swamid-2.0/passport.lu.se-SAML2-shibboleth.xml
+++ b/metadata/swamid-2.0/passport.lu.se-SAML2-shibboleth.xml
@@ -147,7 +147,7 @@ h0X73HoY75row29dAE1JPwF4ckyRhUU1cQ==</ds:X509Certificate>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:passportadmin@epic.lu.se</md:EmailAddress>
diff --git a/metadata/swamid-2.0/play.chalmers.se.xml b/metadata/swamid-2.0/play.chalmers.se.xml
index f7230949..61ec3374 100644
--- a/metadata/swamid-2.0/play.chalmers.se.xml
+++ b/metadata/swamid-2.0/play.chalmers.se.xml
@@ -46,7 +46,7 @@
     <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/play.ju.se.xml b/metadata/swamid-2.0/play.ju.se.xml
index 83a47296..0f922ce8 100644
--- a/metadata/swamid-2.0/play.ju.se.xml
+++ b/metadata/swamid-2.0/play.ju.se.xml
@@ -45,11 +45,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Jönköping University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Jönköping University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stiftelsen Högskolan i Jönköping</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Jönköping University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Jönköping University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ju.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ju.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ju.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ju.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:EmailAddress>mailto:swamid@ju.se</md:EmailAddress>
diff --git a/metadata/swamid-2.0/play.konstfack.se.xml b/metadata/swamid-2.0/play.konstfack.se.xml
index 7e3bafed..65e09ccc 100644
--- a/metadata/swamid-2.0/play.konstfack.se.xml
+++ b/metadata/swamid-2.0/play.konstfack.se.xml
@@ -44,11 +44,11 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.konstfack.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KONSTFACK.se</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Konstfack</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Konstfack</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">KONSTFACK.se</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Konstfack</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://play.konstfack.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.konstfack.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.konstfack.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/play.mdu.se.xml b/metadata/swamid-2.0/play.mdu.se.xml
index 65ab62a6..713ac4e9 100644
--- a/metadata/swamid-2.0/play.mdu.se.xml
+++ b/metadata/swamid-2.0/play.mdu.se.xml
@@ -58,9 +58,9 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Mälardalens Universitet</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älardalens Universitet</md:OrganizationDisplayName>
+    <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>
diff --git a/metadata/swamid-2.0/play.umu.se.xml b/metadata/swamid-2.0/play.umu.se.xml
index 562df894..b55ebc4c 100644
--- a/metadata/swamid-2.0/play.umu.se.xml
+++ b/metadata/swamid-2.0/play.umu.se.xml
@@ -84,9 +84,9 @@ C+iPTJEQgKHrzmn/POLljos2ikF6RW9h8z1Qp0mSbvrXAdcqjw==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.umu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/play.vr.se.xml b/metadata/swamid-2.0/play.vr.se.xml
index 1b9cf58e..19b2c11b 100644
--- a/metadata/swamid-2.0/play.vr.se.xml
+++ b/metadata/swamid-2.0/play.vr.se.xml
@@ -46,8 +46,8 @@
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.vr.se/english.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.vr.se/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.vr.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Iver AB</md:Company>
diff --git a/metadata/swamid-2.0/program.portal.chalmers.se.xml b/metadata/swamid-2.0/program.portal.chalmers.se.xml
index dc525d84..6122bd9c 100644
--- a/metadata/swamid-2.0/program.portal.chalmers.se.xml
+++ b/metadata/swamid-2.0/program.portal.chalmers.se.xml
@@ -104,7 +104,7 @@ H6t7SvwgQMJjPMIwjA==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/reset.hig.se-shibboleth.xml b/metadata/swamid-2.0/reset.hig.se-shibboleth.xml
index 092aec83..efb8e2f8 100644
--- a/metadata/swamid-2.0/reset.hig.se-shibboleth.xml
+++ b/metadata/swamid-2.0/reset.hig.se-shibboleth.xml
@@ -158,7 +158,7 @@ lMOz+Kj2C6PIsuI=
     <md:OrganizationName xml:lang="sv">Högskolan i Gävle</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">University of Gävle</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hig.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.hig.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
diff --git a/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml b/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
index 9e946568..b424dfe4 100644
--- a/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
@@ -93,7 +93,7 @@ Ups/jHo17mVCZzcM0x5imtqhWLwjaXR+W/DEdCM9mmbp3HEZoCRhB66c
     <md:OrganizationName xml:lang="sv">IDsec Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">IDsec</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">IDsec</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://idsec.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://idsec.se/home/en.html</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://idsec.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
diff --git a/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml b/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
index 05367752..251f2fcb 100644
--- a/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
@@ -92,7 +92,7 @@
     <md:OrganizationName xml:lang="sv">IDsec Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">IDsec</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">IDsec</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://idsec.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://idsec.se/home/en.html</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://idsec.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
diff --git a/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml b/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
index 9b355951..93c9dd75 100644
--- a/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
@@ -69,7 +69,7 @@ s94=</ds:X509Certificate>
     <md:OrganizationDisplayName xml:lang="sv">IDsec</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">IDsec</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://idsec.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://idsec.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://idsec.se/home/en.html</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>IDsec</md:Company>
diff --git a/metadata/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml b/metadata/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
index 88259ab3..331ea5f5 100644
--- a/metadata/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
+++ b/metadata/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
@@ -63,7 +63,7 @@ GubHT3wU9oAc2m8JiDKXYLXApcjaMStPOf+JhWXfzg2DuwbLFhYBQoHTU2gc</ds:X509Certificate
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Registratorsfunktionen Uppsala universitet</md:GivenName>
diff --git a/metadata/swamid-2.0/sp.saml.v2.ebbot.app-ebbdys6h7km4bq8pcqz2gescorijo2-metadata.xml.xml b/metadata/swamid-2.0/sp.saml.v2.ebbot.app-ebbdys6h7km4bq8pcqz2gescorijo2-metadata.xml.xml
index b3655e6c..924ee175 100644
--- a/metadata/swamid-2.0/sp.saml.v2.ebbot.app-ebbdys6h7km4bq8pcqz2gescorijo2-metadata.xml.xml
+++ b/metadata/swamid-2.0/sp.saml.v2.ebbot.app-ebbdys6h7km4bq8pcqz2gescorijo2-metadata.xml.xml
@@ -40,7 +40,7 @@
     <md:OrganizationName xml:lang="sv">Uppsala Universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml b/metadata/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
index 87b1d5f8..7549be2c 100644
--- a/metadata/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
+++ b/metadata/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
@@ -107,7 +107,7 @@ fzlJj71/4uCEeTbBlwOySaxHv/Wipvy6TewjRf6jZh5tAClf16I+X7dfWMXZbNxz
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>System</md:GivenName>
diff --git a/metadata/swamid-2.0/test.gdb.vr.se.xml b/metadata/swamid-2.0/test.gdb.vr.se.xml
index fd8b8a43..d178ebaa 100644
--- a/metadata/swamid-2.0/test.gdb.vr.se.xml
+++ b/metadata/swamid-2.0/test.gdb.vr.se.xml
@@ -95,7 +95,7 @@ Ipo2oUGm1iXxmDB7XIubtQ==</ds:X509Certificate>
     <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.vr.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.vr.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Iver AB</md:Company>
diff --git a/metadata/swamid-2.0/test.play.vr.se.xml b/metadata/swamid-2.0/test.play.vr.se.xml
index ddc86b16..d31c02fe 100644
--- a/metadata/swamid-2.0/test.play.vr.se.xml
+++ b/metadata/swamid-2.0/test.play.vr.se.xml
@@ -46,8 +46,8 @@
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.vr.se/english.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.vr.se/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.vr.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Iver AB</md:Company>
diff --git a/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml b/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
index 12fd6ebd..7b1e8edc 100644
--- a/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
@@ -55,7 +55,7 @@
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå university</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.umu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Humlab Support</md:GivenName>
diff --git a/metadata/swamid-2.0/visp.humlab.umu.se.xml b/metadata/swamid-2.0/visp.humlab.umu.se.xml
index 876fb79f..6fed6c3c 100644
--- a/metadata/swamid-2.0/visp.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/visp.humlab.umu.se.xml
@@ -77,7 +77,7 @@
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå university</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.umu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Humlab Support</md:GivenName>
diff --git a/metadata/swamid-2.0/www.egencia.com-auth-v1.xml b/metadata/swamid-2.0/www.egencia.com-auth-v1.xml
index 4ea310cc..c3cd3985 100644
--- a/metadata/swamid-2.0/www.egencia.com-auth-v1.xml
+++ b/metadata/swamid-2.0/www.egencia.com-auth-v1.xml
@@ -83,8 +83,8 @@ Dayq/Sjr/L7kviW0fsYSYZ+oJH8Af07guJRCLGT+LUKGi1gRDb/KuPA2</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Egencia</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Egencia</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Egencia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.egencia.com</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">www.egencia.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.egencia.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.egencia.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Egencia</md:Company>
diff --git a/metadata/swamid-edugain/account.test.eciu.eu.xml b/metadata/swamid-edugain/account.test.eciu.eu.xml
index cde94da2..da44e0c1 100644
--- a/metadata/swamid-edugain/account.test.eciu.eu.xml
+++ b/metadata/swamid-edugain/account.test.eciu.eu.xml
@@ -111,7 +111,7 @@ sJsEninefxMzTf02</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="en">ECIU University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">ECIU University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://eciu.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.eciu.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ECIU University</md:Company>
diff --git a/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
index 92e35b2c..2d701ad1 100644
--- a/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
@@ -111,7 +111,7 @@
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Umeå University</md:Company>
diff --git a/metadata/swamid-edugain/gdb.vr.se.xml b/metadata/swamid-edugain/gdb.vr.se.xml
index f1da4853..d02868cb 100644
--- a/metadata/swamid-edugain/gdb.vr.se.xml
+++ b/metadata/swamid-edugain/gdb.vr.se.xml
@@ -94,8 +94,8 @@ ZmCvWMy0Tq4xRtVivWY7tePnTEKs9LMKoFMKWZliUVZiR0TO5BE0yTUAKluZBHrz
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vr.se/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.vr.se/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.vr.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Iver AB</md:Company>
diff --git a/metadata/swamid-edugain/idp-shib.slu.se-idp.xml b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
index 05fc5beb..af8854d2 100644
--- a/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
+++ b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
@@ -237,7 +237,7 @@ ffEVzH+iKOe5hd6R</ds:X509Certificate>
     <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:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>IT Helpdesk</md:GivenName>
diff --git a/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
index 630d3c72..e57dc832 100644
--- a/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
@@ -69,7 +69,7 @@
     <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
index 00aaf4f7..5a56d79c 100644
--- a/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
@@ -109,10 +109,10 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k</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">Kristianstad University Sweden</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Kristianstad University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Högskolan Kristianstad</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Kristianstad University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.hkr.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.hkr.se/en/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/idp.vr.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp.vr.se-adfs-services-trust.xml
index 4b99fa94..128bf849 100644
--- a/metadata/swamid-edugain/idp.vr.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp.vr.se-adfs-services-trust.xml
@@ -65,9 +65,9 @@
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Research Council</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.vr.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.vr.se/english.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.vr.se/english/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Vetenskapsrådet</md:Company>
diff --git a/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
index 65ca590b..c8254a81 100644
--- a/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
@@ -133,7 +133,7 @@
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>Umeå University</md:Company>
diff --git a/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml b/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
index 5c14c476..8c2e05c7 100644
--- a/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
@@ -66,7 +66,7 @@
     <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml b/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
index 9aa6c491..e6cb994f 100644
--- a/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
@@ -115,9 +115,9 @@ VrFRnL6s6WXvC4dWzAggSoEp53xrRU2NaFzuHsRXD8Gj</ds:X509Certificate>
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Södertörn Universsity</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Södertörn University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Södertörn Universsity</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Södertörn University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.sh.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.sh.se/</md:OrganizationURL>
   </md:Organization>
-- 
cgit v1.2.3