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

9 files changed, 30 insertions, 30 deletions

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>