Corrected use of OrganizationName and OrganizationDisplayName, more to come.md-2024-02-20-v04

45 files changed, 98 insertions, 98 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 e63df624..34f82b5f 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
@@ -144,8 +144,8 @@ N3TaL36eL8QAIIDX0qq6FGMf5AG8mdJ1Sew/dOXmkw6LgIrjIw==
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md: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 03b53833..516ff732 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
@@ -144,8 +144,8 @@ Ke0XYDdP1Yqw/d+BRui3l7D4VWaYig==
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Selma at Uppsala University</md:GivenName>
diff --git a/metadata/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
index 4887be3b..2c89d86e 100644
--- a/metadata/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
@@ -110,12 +110,12 @@ FI52lT8I
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml
index 6e49b70d..4e6eb5a1 100644
--- a/metadata/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml
@@ -108,12 +108,12 @@ dab5tz1u9Ut/ENhzMXvzJ/pOVqKwaKImq60wjMSBX157cHZp0cwOL/Y=</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
index 9040ac34..02acdc8e 100644
--- a/metadata/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
@@ -114,8 +114,8 @@ WdMLKixMaF7Vggu7L05EeKCLm2QR2qRNqg==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
index 3858ef09..70812eeb 100644
--- a/metadata/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
@@ -114,8 +114,8 @@ gL7Pmj+wCIaPgKIgLqqFDAc=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml b/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
index 84955b33..95b6adf0 100644
--- a/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
+++ b/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
@@ -82,7 +82,7 @@ bWT36gZBwduDofUmksqv1JVB+mK78Cc3ziKbA5a+FxuIVZvCTG62N7Ogxb2wqrPr
     <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</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml b/metadata/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
index 1696aeff..559ba6c9 100644
--- a/metadata/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
+++ b/metadata/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
@@ -36,8 +36,8 @@
     <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</md:OrganizationURL>
-    <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="sv">http://www.uu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sadegh Kafian</md:GivenName>
diff --git a/metadata/swamid-2.0/epc.ub.uu.se-shibboleth.xml b/metadata/swamid-2.0/epc.ub.uu.se-shibboleth.xml
index c08442be..81e51eeb 100644
--- a/metadata/swamid-2.0/epc.ub.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/epc.ub.uu.se-shibboleth.xml
@@ -113,8 +113,8 @@ cZJunLsAeGOJaMQ=</ds:X509Certificate>
     <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">https://www.uu.se/en/?languageId=1</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se</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="technical">
     <md:GivenName>Palle</md:GivenName>
diff --git a/metadata/swamid-2.0/integratorsportal.ladok.se-saml2-metadata-.xml b/metadata/swamid-2.0/integratorsportal.ladok.se-saml2-metadata-.xml
index 0551edbb..61103e98 100644
--- a/metadata/swamid-2.0/integratorsportal.ladok.se-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/integratorsportal.ladok.se-saml2-metadata-.xml
@@ -76,8 +76,8 @@
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
index b2b9e72e..a16775b9 100644
--- a/metadata/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
@@ -132,8 +132,8 @@ NfQDpSg=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/jenkins-stage.utv.ladok.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/jenkins-stage.utv.ladok.se-securityRealm-finishLogin.xml
index 3e5b0022..617ad098 100644
--- a/metadata/swamid-2.0/jenkins-stage.utv.ladok.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/jenkins-stage.utv.ladok.se-securityRealm-finishLogin.xml
@@ -126,8 +126,8 @@
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
index 0f643a87..3f885634 100644
--- a/metadata/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
@@ -114,8 +114,8 @@ KnGw6CVwojyapKmEYuZvplqkdWyJyC61nA+Km8iYfly3/MQ+NfoAaeTtz7U=</ds:X509Certificate
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index d25243d8..03d184a9 100644
--- a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index 97d2b5e2..6b731d88 100644
--- a/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index 2328e05e..175214dd 100644
--- a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 11ccc3e3..24529b7e 100644
--- a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
index 4f140d3c..873e126b 100644
--- a/metadata/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
@@ -120,8 +120,8 @@ rFvdF8gCHEnjfviNNgK9lxzv8cnVgqzs5PpAw9JKyxMtMpoSJAzpWoKs1sPWUM7MK9+W9lWeiEQr
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
index 414726d3..8ac38af4 100644
--- a/metadata/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
@@ -117,8 +117,8 @@ dkLjQRYs9GG3G92xAROCQE9lijZLmU6mNq8vHKrYjmRyNWvXzSwWJd+eLEsARxzprwjxDU93gZHV
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-gui-sp.xml
index 0845d80e..9ee29910 100644
--- a/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-student-sp.xml
index 21c831b5..430b649a 100644
--- a/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-p20.ladok.umu.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/lists-test.its.uu.se-shibboleth.xml b/metadata/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
index 4e7d28bc..4e07bf7d 100644
--- a/metadata/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
@@ -61,8 +61,8 @@ wzb6WuA6SpmDZEUhZiP8E/PnBg==</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitet</md:Company>
diff --git a/metadata/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml b/metadata/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml
index 8325f30e..2c9f8885 100644
--- a/metadata/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml
+++ b/metadata/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml
@@ -65,11 +65,11 @@ ufzkKe5vvqXqYX2aBjXdid0PHAh6Y+LYKdjojkht+ru73rV9C6UglVLVwjPhhhH0
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University Library</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/library</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/bibliotek</md:OrganizationURL>
+    <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="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitetsbibliotek</md:Company>
diff --git a/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml b/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
index 7527d37e..b0545ff7 100644
--- a/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
+++ b/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
@@ -65,12 +65,12 @@ ySqAPd9hUwAFL5puOeLc3XKq</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ezproxy.its.uu.se/Shibboleth.sso/SAML/Artifact" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala Universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University Library</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/bibliotek</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/library</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitetsbibliotek</md:Company>
diff --git a/metadata/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml b/metadata/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml
index 7147df69..d2df8fe9 100644
--- a/metadata/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml
@@ -97,8 +97,8 @@ JXGqqhG/E2dBIwnt5fEXVA==</ds:X509Certificate>
     <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">https://www.uu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se</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="support">
     <md:Company>Uppsala universitet</md:Company>
diff --git a/metadata/swamid-2.0/sonarqube.infra.utv.ladok.se-saml.xml b/metadata/swamid-2.0/sonarqube.infra.utv.ladok.se-saml.xml
index c851b7f8..8295c4ea 100644
--- a/metadata/swamid-2.0/sonarqube.infra.utv.ladok.se-saml.xml
+++ b/metadata/swamid-2.0/sonarqube.infra.utv.ladok.se-saml.xml
@@ -115,8 +115,8 @@ Ci/CAr33dUEzEMg0ucoEbiNpnDQPMu/kJcweIq9NXMiA07A=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</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 42c3fd45..88259ab3 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
@@ -62,8 +62,8 @@ GubHT3wU9oAc2m8JiDKXYLXApcjaMStPOf+JhWXfzg2DuwbLFhYBQoHTU2gc</ds:X509Certificate
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md: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 7ef34841..b3655e6c 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,8 +40,8 @@
     <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">https://www.uu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</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">
     <md:GivenName>Registratorsfunktionen Uppsala universitet</md:GivenName>
diff --git a/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
index 7e7f04f3..ae766c01 100644
--- a/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
index db1ef7da..721c5084 100644
--- a/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
index 588e6316..f47fc445 100644
--- a/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index 55773a00..741f0b07 100644
--- a/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
index 198d9aa8..7022e633 100644
--- a/metadata/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
@@ -114,8 +114,8 @@ yPoIQ1Flc8ORgIcmUzQYhlzEF4PxMZgnag==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/sympa.test.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/sympa.test.uu.se-Shibboleth.sso.xml
index 14817e38..ac3ba14d 100644
--- a/metadata/swamid-2.0/sympa.test.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/sympa.test.uu.se-Shibboleth.sso.xml
@@ -136,8 +136,8 @@ vKx0pqTHtuRg6gtxSG7kMWHPuQEsKCYLemEvTOUAfpxN1FpSsxUvxw==</ds:X509Certificate>
     <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">https://www.uu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</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">
     <md:Company>Uppsala universitet</md:Company>
diff --git a/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml b/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
index d4302db6..3f2f7aa2 100644
--- a/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
@@ -47,8 +47,8 @@
     <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">https://www.uu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se/</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="support">
     <md:Company>Uppsala universitet</md:Company>
diff --git a/metadata/swamid-2.0/www.alvin-portal.org-shibboleth.xml b/metadata/swamid-2.0/www.alvin-portal.org-shibboleth.xml
index 7ab7a324..0c5bfe66 100644
--- a/metadata/swamid-2.0/www.alvin-portal.org-shibboleth.xml
+++ b/metadata/swamid-2.0/www.alvin-portal.org-shibboleth.xml
@@ -112,8 +112,8 @@ WLv9BHJ8a6p0tbW0ga7EdUKfXTgT9P/CEY6YqjNkHhNYY5VsABX5FFqveA==</ds:X509Certificate
     <md:OrganizationName xml:lang="sv">Uppsala Universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/?languageId=1</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uu.se</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="technical">
     <md:GivenName>Palle</md:GivenName>
diff --git a/metadata/swamid-2.0/www.diva-portal.org-shibboleth.xml b/metadata/swamid-2.0/www.diva-portal.org-shibboleth.xml
index f0c37fba..e43325bb 100644
--- a/metadata/swamid-2.0/www.diva-portal.org-shibboleth.xml
+++ b/metadata/swamid-2.0/www.diva-portal.org-shibboleth.xml
@@ -122,8 +122,8 @@ yj0HUlH7EakBBU7CWa6jN7NP5c6LFp6KUVbkGapusrzZqP6jLNDW</ds:X509Certificate>
     <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="sv">https://www.uu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/?languageId=1</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Palle</md:GivenName>
diff --git a/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
index 0faa807c..185d06b9 100644
--- a/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
+++ b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml b/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
index 3c23c0b5..6f022767 100644
--- a/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -107,8 +107,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-edugain/indico.uu.se-shibboleth.xml b/metadata/swamid-edugain/indico.uu.se-shibboleth.xml
index d2ab2ea0..9b3e6dd5 100644
--- a/metadata/swamid-edugain/indico.uu.se-shibboleth.xml
+++ b/metadata/swamid-edugain/indico.uu.se-shibboleth.xml
@@ -139,7 +139,7 @@ qjgK4CHGqmHDplbFs/i9cpFzVHKHNgz5wvLuoA==</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-edugain/ladok3.its.umu.se-shibboleth.xml b/metadata/swamid-edugain/ladok3.its.umu.se-shibboleth.xml
index c358229b..6c9edf1e 100644
--- a/metadata/swamid-edugain/ladok3.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-edugain/ladok3.its.umu.se-shibboleth.xml
@@ -110,8 +110,8 @@ vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
index 4653468f..c6faef34 100644
--- a/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
index ee3ae65a..1812d494 100644
--- a/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
index 85b66f5b..e6c68285 100644
--- a/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
diff --git a/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
index 85482b11..739f733f 100644
--- a/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
@@ -102,8 +102,8 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>