Corrected use of OrganizationName and OrganizationDisplayName, more to come.

43 files changed, 90 insertions, 90 deletions

diff --git a/metadata/swamid-2.0/account.lnu.se-Saml2.xml b/metadata/swamid-2.0/account.lnu.se-Saml2.xml
index 144f5dbb..522d9458 100644
--- a/metadata/swamid-2.0/account.lnu.se-Saml2.xml
+++ b/metadata/swamid-2.0/account.lnu.se-Saml2.xml
@@ -51,8 +51,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-2.0/activate-test.du.se-shibboleth.xml b/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
index f649f961..5acb91b8 100644
--- a/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
+++ b/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
@@ -102,8 +102,8 @@ qb/n+Wv3Fk7R4OnXVOYa1p9kCe/duFqtDOpQa3so6HLaB2baXjpxq4n9wwJ+rrng
   <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-2.0/activate.du.se-shibboleth.xml b/metadata/swamid-2.0/activate.du.se-shibboleth.xml
index 4d529f78..54a830f1 100644
--- a/metadata/swamid-2.0/activate.du.se-shibboleth.xml
+++ b/metadata/swamid-2.0/activate.du.se-shibboleth.xml
@@ -101,8 +101,8 @@ qb/n+Wv3Fk7R4OnXVOYa1p9kCe/duFqtDOpQa3so6HLaB2baXjpxq4n9wwJ+rrng
   <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-2.0/cuttlefish.pdc.kth.se.xml b/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
index 2d0b9f36..ccfd56ca 100644
--- a/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
+++ b/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
@@ -99,8 +99,8 @@ iC0vZyfVeVSTgXKo/0dTJDsIEdJmRhVoJvYV81GZ1hdj9wxC/UTGWYaQbmBm+sfW
   <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-2.0/diskus-demo.ub.uu.se-saml-metadata.xml b/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
index 95b6adf0..40e33304 100644
--- a/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
+++ b/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
@@ -82,8 +82,8 @@ bWT36gZBwduDofUmksqv1JVB+mK78Cc3ziKbA5a+FxuIVZvCTG62N7Ogxb2wqrPr
     <md:OrganizationName xml:lang="sv">Uppsala Universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sadegh kafian</md:GivenName>
diff --git a/metadata/swamid-2.0/e-arkiv.sys.kth.se-saml2-metadata-.xml b/metadata/swamid-2.0/e-arkiv.sys.kth.se-saml2-metadata-.xml
index 023e442a..5abbbf58 100644
--- a/metadata/swamid-2.0/e-arkiv.sys.kth.se-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/e-arkiv.sys.kth.se-saml2-metadata-.xml
@@ -51,10 +51,10 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationName>
+    <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-2.0/fs.uka.se-adfs-services-trust.xml b/metadata/swamid-2.0/fs.uka.se-adfs-services-trust.xml
index 239491c3..7ed274e5 100644
--- a/metadata/swamid-2.0/fs.uka.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/fs.uka.se-adfs-services-trust.xml
@@ -56,8 +56,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish Higher Education Authority</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitetskanslersämbetet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UKA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">UKÄ</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Higher Education Authority</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitetskanslersämbetet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://english.uka.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.uka.se</md:OrganizationURL>
   </md:Organization>
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 d8bd13d2..78da81fc 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
@@ -38,8 +38,8 @@
   <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-2.0/id-test.du.se-saml2.xml b/metadata/swamid-2.0/id-test.du.se-saml2.xml
index 8fd06346..1621d2c9 100644
--- a/metadata/swamid-2.0/id-test.du.se-saml2.xml
+++ b/metadata/swamid-2.0/id-test.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">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-2.0/id.du.se-saml2.xml b/metadata/swamid-2.0/id.du.se-saml2.xml
index af222a25..c98f90d3 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">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-2.0/idp.qa.lnu.se-idp-shibboleth.xml b/metadata/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
index 808ce3d2..79dab085 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
@@ -275,8 +275,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-2.0/konto.bth.se-sp.xml b/metadata/swamid-2.0/konto.bth.se-sp.xml
index 57588fa3..99c48e89 100644
--- a/metadata/swamid-2.0/konto.bth.se-sp.xml
+++ b/metadata/swamid-2.0/konto.bth.se-sp.xml
@@ -76,8 +76,8 @@ b28suxO0FvWtK5SZmcQV5RFfVE9XHN2WCCkE4+1C</ds:X509Certificate>
   <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-2.0/login.focus.lib.kth.se-Shibboleth.sso.xml b/metadata/swamid-2.0/login.focus.lib.kth.se-Shibboleth.sso.xml
index 1484554d..de0d8cba 100644
--- a/metadata/swamid-2.0/login.focus.lib.kth.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/login.focus.lib.kth.se-Shibboleth.sso.xml
@@ -73,10 +73,10 @@ CoVBZbQ7Io2uMGXNXcAMdmukE6GBN+QyddFkxsQA+i2/cM5wLurA9JUylydR22VA
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.focus.lib.kth.se/Shibboleth.sso/SAML/Artifact" index="4"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationName>
+    <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="sv">KTH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">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-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml b/metadata/swamid-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml
index 4c69e2f7..83ab686d 100644
--- a/metadata/swamid-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml
@@ -75,8 +75,8 @@ GTBaDLQr8XPEeFauq8kDs0v6Fl8GZj34buXdhC5VOQYWE/o7EH7VqodKD/hUTQ==</ds:X509Certifi
   <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="sv">KTH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">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="sv">https://www.kth.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.kth.se/en</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/monitor.inacademia.org.xml b/metadata/swamid-2.0/monitor.inacademia.org.xml
index 14cb1532..158283f0 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">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-2.0/play.gu.se.xml b/metadata/swamid-2.0/play.gu.se.xml
index baed4799..d256221b 100644
--- a/metadata/swamid-2.0/play.gu.se.xml
+++ b/metadata/swamid-2.0/play.gu.se.xml
@@ -44,8 +44,8 @@
   <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-2.0/play.kth.se-external-kaltura.nordu.net.xml b/metadata/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
index bf733a85..31cec09e 100644
--- a/metadata/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
+++ b/metadata/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
@@ -46,8 +46,8 @@
   <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-2.0/sp.it.gu.se-shibboleth.xml b/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
index e31781c1..93d5e5a8 100644
--- a/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
@@ -136,8 +136,8 @@ Yi1mDJVKyo1wTH2lyetsKCTN+xkbFvcq0DvmNV2+eV9FR+OepsPDaLghVw==</ds:X509Certificate
   <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="sv">GU</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">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-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index 315bff72..f90c544f 100644
--- a/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -66,8 +66,8 @@
   <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-2.0/wg-onboard.lan.kth.se-shibboleth.xml b/metadata/swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml
index ad3d6585..dcad80d8 100644
--- a/metadata/swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml
@@ -134,8 +134,8 @@ AWE9gLXkqERlcPFazSerNf/Uzw8IYZBb6p5gWI84epkbYBX3Kw==
   <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-2.0/wiki.pdc.kth.se.xml b/metadata/swamid-2.0/wiki.pdc.kth.se.xml
index ee315d9a..9259688f 100644
--- a/metadata/swamid-2.0/wiki.pdc.kth.se.xml
+++ b/metadata/swamid-2.0/wiki.pdc.kth.se.xml
@@ -99,8 +99,8 @@ iC0vZyfVeVSTgXKo/0dTJDsIEdJmRhVoJvYV81GZ1hdj9wxC/UTGWYaQbmBm+sfW
   <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-2.0/wireguard.lan.kth.se-shibboleth.xml b/metadata/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
index c466326a..54c39d49 100644
--- a/metadata/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
@@ -133,8 +133,8 @@ t9aBsdTlfwJ/uIsv+XH0G0JmupgEaz0EZuxstYxEJXQdxrmTW3cFz5bS1KXNAF70
   <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="sv">KTH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">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/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>
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 72b9cc65..ff43f884 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
@@ -70,8 +70,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-testing/idp.auth.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
index 4d651a8e..7e51d35c 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,8 +54,8 @@
   <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-testing/idp2.it.gu.se-idp-shibboleth.xml b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
index 610bbe1e..b529e509 100644
--- a/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
@@ -214,8 +214,8 @@ ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
   <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-testing/idptest.it.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
index eef67cff..7877105e 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
@@ -64,8 +64,8 @@
   <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-testing/login-dev.du.se-idp-shibboleth.xml b/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml
index 5e6be939..d68861c6 100644
--- a/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml
@@ -295,8 +295,8 @@ xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</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-testing/samlvettingspdev.test.it.gu.se.xml b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
index 6cf8ffa3..e8cbb85d 100644
--- a/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
+++ b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
@@ -82,8 +82,8 @@ KdDCYYX3nxmihSFMU9MLBACFzLYjVf3/BNPNIQ==</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-testing/test.play.gu.se.xml b/metadata/swamid-testing/test.play.gu.se.xml
index e6b87850..33652d6c 100644
--- a/metadata/swamid-testing/test.play.gu.se.xml
+++ b/metadata/swamid-testing/test.play.gu.se.xml
@@ -44,8 +44,8 @@
   <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>