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

24 files changed, 79 insertions, 79 deletions

diff --git a/metadata/swamid-2.0/hvplay.hv.se.xml b/metadata/swamid-2.0/hvplay.hv.se.xml
index 4253ef89..17cffc68 100644
--- a/metadata/swamid-2.0/hvplay.hv.se.xml
+++ b/metadata/swamid-2.0/hvplay.hv.se.xml
@@ -61,12 +61,12 @@ EVqGTcbN/XE+0znfYyzSdEX25i0aDKJVgkshouDWQ703Qp2u9w==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hvplay.hv.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HV Play</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HV Play</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HV Play</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">HV Play</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://hvplay.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://hvplay.hv.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">University West</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Väst</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hv.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>University West</md:GivenName>
diff --git a/metadata/swamid-2.0/konto.his.se.xml b/metadata/swamid-2.0/konto.his.se.xml
index 44cef4e8..db36f1f4 100644
--- a/metadata/swamid-2.0/konto.his.se.xml
+++ b/metadata/swamid-2.0/konto.his.se.xml
@@ -114,12 +114,12 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">HIS</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">HIS</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Skövde</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Skövde</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University of Skövde</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.his.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.his.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.his.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.his.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Systemutveckling</md:GivenName>
diff --git a/metadata/swamid-2.0/monitor.inacademia.org.xml b/metadata/swamid-2.0/monitor.inacademia.org.xml
index eee5d38b..14cb1532 100644
--- a/metadata/swamid-2.0/monitor.inacademia.org.xml
+++ b/metadata/swamid-2.0/monitor.inacademia.org.xml
@@ -109,8 +109,8 @@ zsXQVJAqskmGViuZ9wXqQHoVHyPfXpBbnqq3mEPXvaLEpv26L1WtaAsXaSAPlHob
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">InAcademia operated by GÉANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">InAcademia operated by GÉANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/saml.account.hh.se-shibboleth.xml b/metadata/swamid-2.0/saml.account.hh.se-shibboleth.xml
index 6271c3a4..8ea00123 100644
--- a/metadata/swamid-2.0/saml.account.hh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/saml.account.hh.se-shibboleth.xml
@@ -143,11 +143,11 @@ cSPM/gSW3ZQ6+jEOTQZhwoPDQGAMSLzY4LVyw2fxZXgWUxJV5nounTS8kVg=</ds:X509Certificate
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Halmstad university</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Halmstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Halmstad</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hh.se/english.html</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml b/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
index 77552ff7..9e946568 100644
--- a/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
@@ -89,8 +89,8 @@ Ups/jHo17mVCZzcM0x5imtqhWLwjaXR+W/DEdCM9mmbp3HEZoCRhB66c
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sig.idsec.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">IDsec Solutions</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">IDsec Solutions</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">IDsec Solutions AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">IDsec Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">IDsec</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">IDsec</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://idsec.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml b/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
index 3024df76..05367752 100644
--- a/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
@@ -88,8 +88,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sig2.idsec.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">IDsec Solutions</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">IDsec Solutions</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">IDsec Solutions AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">IDsec Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">IDsec</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">IDsec</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://idsec.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml b/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
index 65e341a0..9b355951 100644
--- a/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
@@ -64,8 +64,8 @@ s94=</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sig.idsec.se/sigservice-dev/sign" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">IDsec Solutions</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">IDsec Solutions</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">IDsec Solutions AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">IDsec Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">IDsec</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">IDsec</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://idsec.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml b/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
index b1dd606a..2b88fc94 100644
--- a/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
@@ -130,10 +130,10 @@ Yi1mDJVKyo1wTH2lyetsKCTN+xkbFvcq0DvmNV2+eV9FR+OepsPDaLghVw==</ds:X509Certificate
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/adfs.hv.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.hv.se-adfs-services-trust.xml
index 92e564ee..6c35ed43 100644
--- a/metadata/swamid-edugain/adfs.hv.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.hv.se-adfs-services-trust.xml
@@ -70,12 +70,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University West</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Väst</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hv.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>University West</md:Company>
diff --git a/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
index 5ed514e1..a3608b48 100644
--- a/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
@@ -111,10 +111,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.ju.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HJ</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HJ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Jönköping University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Jönköping University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Jönköping</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HJ</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">HJ</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ju.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.ju.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml b/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
index 26911231..c089e82a 100644
--- a/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
@@ -104,10 +104,10 @@
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm [ADFS]</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics [ADFS]</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.hhs.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:swamid.tech@hhs.se</md:EmailAddress>
diff --git a/metadata/swamid-edugain/idp.hh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.hh.se-idp-shibboleth.xml
index 1f4f8d0b..3a94548d 100644
--- a/metadata/swamid-edugain/idp.hh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.hh.se-idp-shibboleth.xml
@@ -212,8 +212,8 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
     <md:OrganizationName xml:lang="sv">Högskolan i Halmstad</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hh.se/english.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Halmstad University</md:Company>
diff --git a/metadata/swamid-edugain/idp3.hig.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
index 6f97ea3d..df208c0f 100644
--- a/metadata/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
@@ -274,8 +274,8 @@ uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss</ds:X509Certificate>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HIG</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HIG</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Gävle</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Gävle</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University of Gävle</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.hig.se</md:OrganizationURL>
diff --git a/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
index 12632e25..4a63a2f8 100644
--- a/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
@@ -194,10 +194,10 @@ mbmfzT51FSO1LI3Xw2lAtTgYi5oMWqxMao2yJl8MZKP4OY3Y</ds:X509Certificate>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml b/metadata/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
index dbac3e45..7e00464a 100644
--- a/metadata/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
+++ b/metadata/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
@@ -134,9 +134,9 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">InAcademia operated by GÉANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="de">InAcademia operated by GÉANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">InAcademia operated by GÉANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="de">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="de">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
diff --git a/metadata/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d3ccae40..3ffe074c 100644
--- a/metadata/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -43,12 +43,12 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">InAcademia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://inacademia.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://inacademia.org/about</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>InAcademia</md:GivenName>
diff --git a/metadata/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index bcad21f5..76cc8d1a 100644
--- a/metadata/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -43,12 +43,12 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">InAcademia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://inacademia.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://inacademia.org/about</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>InAcademia</md:GivenName>
diff --git a/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
index defea70b..8f23c669 100644
--- a/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
@@ -71,12 +71,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.tad.hv.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University West</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Väst</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hv.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>University West</md:Company>
diff --git a/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
index a4ceca49..4d651a8e 100644
--- a/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
@@ -54,10 +54,10 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>University of Gothenburg</md:Company>
diff --git a/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
index 1a0a0fdc..610bbe1e 100644
--- a/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
@@ -212,10 +212,10 @@ ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
index 3c23944b..eef67cff 100644
--- a/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
@@ -62,10 +62,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.it.gu.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml b/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
index 702189b6..9ab36462 100644
--- a/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
@@ -59,8 +59,8 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.hhs.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
diff --git a/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml b/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
index 474c715e..22b010e7 100644
--- a/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
@@ -192,8 +192,8 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
   <md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.hhs.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
index 4f92ae6e..6cf8ffa3 100644
--- a/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
+++ b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
@@ -80,10 +80,10 @@ KdDCYYX3nxmihSFMU9MLBACFzLYjVf3/BNPNIQ==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
   </md:Organization>