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

18 files changed, 81 insertions, 81 deletions

diff --git a/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml b/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
index 2dfe5e9c..f649f961 100644
--- a/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
+++ b/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
@@ -100,10 +100,10 @@ qb/n+Wv3Fk7R4OnXVOYa1p9kCe/duFqtDOpQa3so6HLaB2baXjpxq4n9wwJ+rrng
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">DU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Dalarna University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Dalarna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">DU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.du.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/activate.du.se-shibboleth.xml b/metadata/swamid-2.0/activate.du.se-shibboleth.xml
index e7cf40e8..4d529f78 100644
--- a/metadata/swamid-2.0/activate.du.se-shibboleth.xml
+++ b/metadata/swamid-2.0/activate.du.se-shibboleth.xml
@@ -99,10 +99,10 @@ qb/n+Wv3Fk7R4OnXVOYa1p9kCe/duFqtDOpQa3so6HLaB2baXjpxq4n9wwJ+rrng
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">DU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Dalarna University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Dalarna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">DU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.du.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index a4c5aac0..3b97ca74 100644
--- a/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -57,8 +57,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Demo - Svensk Nationell Datatjänst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Demo - Swedish National Data Service</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml
index 74daa26e..f534c175 100644
--- a/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -57,12 +57,12 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Demo - Svensk Nationell Datatjänst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Demo - Swedish National Data Service</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://snd.se/sv</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://snd.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://snd.gu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>SND</md:Company>
diff --git a/metadata/swamid-2.0/hb.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/hb.hr.evry.se-shibboleth.xml
index 57c26299..5412d997 100644
--- a/metadata/swamid-2.0/hb.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/hb.hr.evry.se-shibboleth.xml
@@ -88,12 +88,12 @@ uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/about-us/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/om-oss/om-tietoevry/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
diff --git a/metadata/swamid-2.0/id-test.du.se-saml2.xml b/metadata/swamid-2.0/id-test.du.se-saml2.xml
index 07e41b6f..8fd06346 100644
--- a/metadata/swamid-2.0/id-test.du.se-saml2.xml
+++ b/metadata/swamid-2.0/id-test.du.se-saml2.xml
@@ -46,10 +46,10 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">DU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Dalarna University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Dalarna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">DU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.du.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/id.du.se-saml2.xml b/metadata/swamid-2.0/id.du.se-saml2.xml
index 84ddbac8..af222a25 100644
--- a/metadata/swamid-2.0/id.du.se-saml2.xml
+++ b/metadata/swamid-2.0/id.du.se-saml2.xml
@@ -48,8 +48,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Dalarna University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Högskolan Dalarna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">DU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">DU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.du.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/irf.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/irf.hr.evry.se-shibboleth.xml
index 47a2f29c..88edc136 100644
--- a/metadata/swamid-2.0/irf.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/irf.hr.evry.se-shibboleth.xml
@@ -89,12 +89,12 @@ uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/about-us/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/om-oss/om-tietoevry/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
diff --git a/metadata/swamid-2.0/konto.bth.se-sp.xml b/metadata/swamid-2.0/konto.bth.se-sp.xml
index c87fe834..57588fa3 100644
--- a/metadata/swamid-2.0/konto.bth.se-sp.xml
+++ b/metadata/swamid-2.0/konto.bth.se-sp.xml
@@ -74,12 +74,12 @@ b28suxO0FvWtK5SZmcQV5RFfVE9XHN2WCCkE4+1C</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">BTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://bth.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://bth.se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Blekinge Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">BTH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>IThelpdesk</md:GivenName>
diff --git a/metadata/swamid-2.0/play.chalmers.se.xml b/metadata/swamid-2.0/play.chalmers.se.xml
index 1426c852..f7230949 100644
--- a/metadata/swamid-2.0/play.chalmers.se.xml
+++ b/metadata/swamid-2.0/play.chalmers.se.xml
@@ -42,12 +42,12 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.chalmers.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Chalmers</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Chalmers</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Chalmers University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Chalmers tekniska högskola</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
+    <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="sv">https://www.chalmers.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Blended learning team</md:SurName>
diff --git a/metadata/swamid-2.0/primula.oru.se-shibboleth.xml b/metadata/swamid-2.0/primula.oru.se-shibboleth.xml
index a1213436..03ed9166 100644
--- a/metadata/swamid-2.0/primula.oru.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primula.oru.se-shibboleth.xml
@@ -82,12 +82,12 @@ uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/about-us/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/om-oss/om-tietoevry/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
diff --git a/metadata/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
index 7bfcd8fb..8a0452ba 100644
--- a/metadata/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
@@ -70,12 +70,12 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=</ds:X509Certificate
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/about-us/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/om-oss/om-tietoevry/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
diff --git a/metadata/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml
index e767129d..474a1477 100644
--- a/metadata/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml
@@ -82,12 +82,12 @@ Rl9w0lJL52YpAeCfGZZdZ5VUfaIPIdWcRmL4srhuMNYG</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/about-us/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/om-oss/om-tietoevry/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
diff --git a/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml b/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml
index 62f094aa..2021aeb7 100644
--- a/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml
@@ -70,12 +70,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.bth.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">BTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Blekinge Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">BTH</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Blekinge Institute of Technology</md:Company>
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 7396ef74..630d3c72 100644
--- a/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
@@ -66,11 +66,11 @@
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola Aktiebolag</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.chalmers.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.chalmers.se</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
+    <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">
     <md:GivenName>Niklas</md:GivenName>
diff --git a/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
index d5e71e22..29a30a63 100644
--- a/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
@@ -78,10 +78,10 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==</ds:X509Certificate>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">DU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Dalarna University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Dalarna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">DU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.du.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
   </md:Organization>
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 ed7c448d..5c14c476 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
@@ -63,11 +63,11 @@
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola Aktiebolag</md:OrganizationName>
+    <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">http://www.chalmers.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://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">
     <md:Company>Chalmers</md:Company>
diff --git a/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml b/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
index 49990bdb..72b9cc65 100644
--- a/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
@@ -68,10 +68,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.bth.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Blekinge Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">BTH</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
   </md:Organization>