Corrected use of OrganizationName and OrganizationDisplayName, more to come.md-2024-02-16-v05

21 files changed, 67 insertions, 62 deletions

diff --git a/metadata/swamid-2.0/7t.lbic.lu.se-.xml b/metadata/swamid-2.0/7t.lbic.lu.se-.xml
index cccd5e7d..9bd897d1 100644
--- a/metadata/swamid-2.0/7t.lbic.lu.se-.xml
+++ b/metadata/swamid-2.0/7t.lbic.lu.se-.xml
@@ -45,11 +45,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lu.se/</md:OrganizationURL>
-    <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="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>LBIC IT support</md:GivenName>
diff --git a/metadata/swamid-2.0/account.lnu.se-Saml2.xml b/metadata/swamid-2.0/account.lnu.se-Saml2.xml
index 5fc5fe20..144f5dbb 100644
--- a/metadata/swamid-2.0/account.lnu.se-Saml2.xml
+++ b/metadata/swamid-2.0/account.lnu.se-Saml2.xml
@@ -49,10 +49,10 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">LNU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linnaeus University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Linnéuniversitetet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Linnaeus University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">LNU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">LNU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://lnu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://lnu.se/en</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml b/metadata/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
index 3b2bedc8..43992a9a 100644
--- a/metadata/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
+++ b/metadata/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
@@ -48,7 +48,7 @@
     <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/devpassport.lu.se-SAML2-Shibboleth.xml b/metadata/swamid-2.0/devpassport.lu.se-SAML2-Shibboleth.xml
index a6fc0c23..829f103f 100644
--- a/metadata/swamid-2.0/devpassport.lu.se-SAML2-Shibboleth.xml
+++ b/metadata/swamid-2.0/devpassport.lu.se-SAML2-Shibboleth.xml
@@ -145,8 +145,8 @@ xJzdda9Ua6FK0k0huckyD9Jcf8pMlBagW5iHUv6avcCX</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
     <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="sv">https://www.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/iam.cloud.cbh.kth.se-realms-cloud.xml b/metadata/swamid-2.0/iam.cloud.cbh.kth.se-realms-cloud.xml
index 9423e646..d8bd13d2 100644
--- a/metadata/swamid-2.0/iam.cloud.cbh.kth.se-realms-cloud.xml
+++ b/metadata/swamid-2.0/iam.cloud.cbh.kth.se-realms-cloud.xml
@@ -36,12 +36,12 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cloud.cbh.kth.se/realms/cloud/broker/kth-saml/endpoint" isDefault="true" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Kungliga Tekniska Högskolan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">KTH CBH moln för mjukvaruutveckling</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH CBH cloud for softwardevelopment</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://cloud.cbh.kth.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://cloud.cbh.kth.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Royal Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Kungliga Tekniska högskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">KTH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kth.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.kth.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Jonas</md:GivenName>
diff --git a/metadata/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml b/metadata/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
index a6262d56..808ce3d2 100644
--- a/metadata/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
+++ b/metadata/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
@@ -273,10 +273,10 @@
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qa.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">LNU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet QA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linnaeus University QA</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Linnéuniversitetet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Linnaeus University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">LNU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">LNU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://lnu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://lnu.se/en</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml b/metadata/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
index a87f62cb..06e4f0c7 100644
--- a/metadata/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
@@ -126,7 +126,7 @@ j5gr7XQCCeL9oLyVB3uwplxSZP5Ge9SGrYs62gV66LAgPH8yd7l+KtqEfOk=</ds:X509Certificate
     <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml b/metadata/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
index 27d721b3..0d613771 100644
--- a/metadata/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
@@ -90,12 +90,12 @@ V++yEkt5n8e8BoA3PHj5/MSgzEqPnlNRMhTX5QYW4TYy23uQaXVwybYPSw==</ds:X509Certificate
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://luvittest1.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Lund University LUVIT Test1</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Test system for Lund University LUVIT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Test system for Lund University LUVIT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Lund University LUVIT Test1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Grade</md:Company>
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 e09c809a..7bb028f0 100644
--- a/metadata/swamid-2.0/passport.lu.se-SAML2-shibboleth.xml
+++ b/metadata/swamid-2.0/passport.lu.se-SAML2-shibboleth.xml
@@ -146,7 +146,7 @@ h0X73HoY75row29dAE1JPwF4ckyRhUU1cQ==</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
     <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="sv">https://www.lu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/rb.lbic.lu.se-.xml b/metadata/swamid-2.0/rb.lbic.lu.se-.xml
index a0fcd634..9b27442d 100644
--- a/metadata/swamid-2.0/rb.lbic.lu.se-.xml
+++ b/metadata/swamid-2.0/rb.lbic.lu.se-.xml
@@ -66,8 +66,8 @@ qydeSHsJ7nth74Mp8QxQIFFWt4ojszc=</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rb.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/rb/artifact" index="3"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund university Bioimaging Centre</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lund university Bioimaging Centre</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund university Bioimaging Centre</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Lund university Bioimaging Centre</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.lbic.lu.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/sam.control.lth.se-shibboleth.xml b/metadata/swamid-2.0/sam.control.lth.se-shibboleth.xml
index dbc4181b..573d4474 100644
--- a/metadata/swamid-2.0/sam.control.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sam.control.lth.se-shibboleth.xml
@@ -99,8 +99,8 @@ R83DjysdqOkJezZxfXnsgdhDpyo=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Anders</md:GivenName>
diff --git a/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml b/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml
index 373a2ac6..a0bb1218 100644
--- a/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml
@@ -104,7 +104,7 @@ eantehm2RWmRIz8poebeGW4oirdCtSho8ZuO5JgDcxMB4gUV/QgPmfrxo0cTAL/7
     <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
index 41db3c9a..16a1946d 100644
--- a/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
@@ -112,10 +112,10 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">LNU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linnaeus University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Linnéuniversitetet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Linnaeus University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">LNU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">LNU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://lnu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://lnu.se/en</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
index 3b9795a1..b058d26a 100644
--- a/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
@@ -205,10 +205,10 @@ R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KKH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">KKH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Royal Institute of Art</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Kungl. Konsthögskolan</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Royal Institute of Art</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KKH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">KKH</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.kkh.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.kkh.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml b/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
index ee45e57c..eb2064c9 100644
--- a/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -126,10 +126,10 @@ nnmgcuLeWY0JKSObDThQxmQM+PHnszKEdo9hDZTGcQc49C8dSN7Wup5pFzSm2i0t
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">IRF</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">IRF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Institutet för rymdfysik</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRF</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">IRF</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.irf.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.irf.se/sv/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
index a8a1a3f3..fa0b5e25 100644
--- a/metadata/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
@@ -232,8 +232,8 @@
     <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>LU IdP administrators</md:GivenName>
diff --git a/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml b/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
index 64e81714..32d48218 100644
--- a/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
@@ -143,10 +143,10 @@ jmufPg==</ds:X509Certificate>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-5.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Royal Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Kungliga Tekniska högskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">KTH</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.kth.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.kth.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-testing/devrb.lbic.lu.se-.xml b/metadata/swamid-testing/devrb.lbic.lu.se-.xml
index 89e4bd51..88b8b21c 100644
--- a/metadata/swamid-testing/devrb.lbic.lu.se-.xml
+++ b/metadata/swamid-testing/devrb.lbic.lu.se-.xml
@@ -67,11 +67,11 @@ qydeSHsJ7nth74Mp8QxQIFFWt4ojszc=</ds:X509Certificate>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lund University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lu.se/</md:OrganizationURL>
-    <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="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>LBIC IT support</md:GivenName>
diff --git a/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml b/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml
index e81b4476..b14ca751 100644
--- a/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml
+++ b/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml
@@ -33,9 +33,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Lunds universitet</md:Company>
diff --git a/metadata/swamid-testing/test.ortrac.com-saml-sp.xml b/metadata/swamid-testing/test.ortrac.com-saml-sp.xml
index 988a2895..bd9a2561 100644
--- a/metadata/swamid-testing/test.ortrac.com-saml-sp.xml
+++ b/metadata/swamid-testing/test.ortrac.com-saml-sp.xml
@@ -89,9 +89,12 @@ yQ8Fym8zwW/5KlfigfEnLA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ortrac.com/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lu.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Jakob</md:GivenName>
diff --git a/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml b/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
index 7cb64c83..6b4d1d25 100644
--- a/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
@@ -238,8 +238,8 @@
     <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>LU IdP administrators</md:GivenName>