Corrected use of OrganizationName and OrganizationDisplayName, more to come.

14 files changed, 30 insertions, 30 deletions

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 a3608b48..70848b0c 100644
--- a/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
@@ -112,9 +112,9 @@
   </md:IDPSSODescriptor>
   <md:Organization>
     <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:OrganizationName xml:lang="sv">Stiftelsen Högskolan i Jönköping</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: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/edusign.geant.org-shibboleth.xml b/metadata/swamid-edugain/edusign.geant.org-shibboleth.xml
index 41badc93..d3478752 100644
--- a/metadata/swamid-edugain/edusign.geant.org-shibboleth.xml
+++ b/metadata/swamid-edugain/edusign.geant.org-shibboleth.xml
@@ -134,8 +134,8 @@ D0JLX3MeVkkRHB6FTUzg+qJG2Fiv5Eva+g==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT Association</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT Association</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">GEANT</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">GEANT</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.geant.org</md:OrganizationURL>
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 2021aeb7..8091f371 100644
--- a/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml
@@ -72,8 +72,8 @@
   <md:Organization>
     <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:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</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>
diff --git a/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
index 16a1946d..7e61e936 100644
--- a/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
@@ -114,8 +114,8 @@
   <md:Organization>
     <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:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Linnaeus University</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 b058d26a..105b86cf 100644
--- a/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
@@ -207,8 +207,8 @@ R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
   <md:Organization>
     <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:OrganizationDisplayName xml:lang="en">Royal Institute of Art</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</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/idp3.it.gu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
index 4a63a2f8..8dfdcc17 100644
--- a/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
@@ -196,8 +196,8 @@ mbmfzT51FSO1LI3Xw2lAtTgYi5oMWqxMao2yJl8MZKP4OY3Y</ds:X509Certificate>
   <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="en">GU</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</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/idpshibboleth.irf.se-idp-shibboleth.xml b/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
index eb2064c9..8b49d8e3 100644
--- a/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -128,8 +128,8 @@ nnmgcuLeWY0JKSObDThQxmQM+PHnszKEdo9hDZTGcQc49C8dSN7Wup5pFzSm2i0t
   <md:Organization>
     <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:OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</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/inacademia.org-metadata-inacademia-simple-validation.xml.xml b/metadata/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
index 7e00464a..3d11da0e 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">GEANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="de">GEANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT Association</md:OrganizationName>
+    <md:OrganizationName xml:lang="de">GEANT Association</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT Association</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/login.du.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
index 29a30a63..9d70761b 100644
--- a/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
@@ -80,8 +80,8 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==</ds:X509Certificate>
   <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">DU</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">DU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Högskolan Dalarna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Dalarna University</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-edugain/saml.sys.kth.se-idp-shibboleth.xml b/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
index 32d48218..bb30358d 100644
--- a/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
@@ -145,8 +145,8 @@ jmufPg==</ds:X509Certificate>
   <md:Organization>
     <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:OrganizationDisplayName xml:lang="en">Royal Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan</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-edugain/sp.spraakbanken.gu.se-shibboleth.xml b/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
index d0e79eef..2faf3e74 100644
--- a/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
+++ b/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
@@ -114,8 +114,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GU</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">GU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</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/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 3ffe074c..58de3758 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,8 +43,8 @@
     <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">GEANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT Association</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT Association</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-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 76cc8d1a..290296be 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,8 +43,8 @@
     <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">GEANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">GEANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">GEANT Association</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">GEANT Association</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-edugain/weblogin.smhi.se-idp-shibboleth.xml b/metadata/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml
index 5ca395ba..1bb1e14a 100644
--- a/metadata/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml
@@ -131,8 +131,8 @@ ET8j/24XdLr8q8lq50kEDCM9ZZJJMnxyvkR71gErSYZiQzmpPOb20jHpkwxzgOE=</ds:X509Certifi
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SMHI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SMHI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish Meteorological and Hydrological Institute</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sveriges meteorologiska och hydrologiska institut</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SMHI</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">SMHI</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.smhi.se</md:OrganizationURL>