Corrected use of OrganizationName and OrganizationDisplayName, more to come.md-2024-02-19-v07

32 files changed, 59 insertions, 59 deletions

diff --git a/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
index d63dd00d..fea75105 100644
--- a/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
@@ -145,8 +145,8 @@ R8mUE5/GXIEDE+phas2nY8eQdQK4d9YRTiwXqhvyYE5KOCRp3gSf8QRCEbM=</ds:X509Certificate
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Jimmy</md:GivenName>
diff --git a/metadata/swamid-2.0/acc.studenthalsa.se-shibboleth.xml b/metadata/swamid-2.0/acc.studenthalsa.se-shibboleth.xml
index 52f84ad0..4eaaa33c 100644
--- a/metadata/swamid-2.0/acc.studenthalsa.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.studenthalsa.se-shibboleth.xml
@@ -135,7 +135,7 @@ R8mUE5/GXIEDE+phas2nY8eQdQK4d9YRTiwXqhvyYE5KOCRp3gSf8QRCEbM=</ds:X509Certificate
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Jimmy</md:GivenName>
diff --git a/metadata/swamid-2.0/acc.uhrporten.se-shibboleth.xml b/metadata/swamid-2.0/acc.uhrporten.se-shibboleth.xml
index 6b55a4fb..cb3a8ad9 100644
--- a/metadata/swamid-2.0/acc.uhrporten.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.uhrporten.se-shibboleth.xml
@@ -138,7 +138,7 @@ R8mUE5/GXIEDE+phas2nY8eQdQK4d9YRTiwXqhvyYE5KOCRp3gSf8QRCEbM=</ds:X509Certificate
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Jimmy</md:GivenName>
diff --git a/metadata/swamid-2.0/confluence.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/confluence.its.umu.se-shibboleth.xml
index 79edf04e..a99ff06a 100644
--- a/metadata/swamid-2.0/confluence.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/confluence.its.umu.se-shibboleth.xml
@@ -95,11 +95,11 @@ iDg+++MxNlMn5A==</ds:X509Certificate>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå Universitet</md:Company>
diff --git a/metadata/swamid-2.0/datalab.humlab.umu.se.xml b/metadata/swamid-2.0/datalab.humlab.umu.se.xml
index f19a737d..e11ed5f0 100644
--- a/metadata/swamid-2.0/datalab.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/datalab.humlab.umu.se.xml
@@ -45,8 +45,8 @@
     <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://umu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan von Boer</md:GivenName>
diff --git a/metadata/swamid-2.0/demo.studenthalsa.se-shibboleth.xml b/metadata/swamid-2.0/demo.studenthalsa.se-shibboleth.xml
index a1baee69..2074aae0 100644
--- a/metadata/swamid-2.0/demo.studenthalsa.se-shibboleth.xml
+++ b/metadata/swamid-2.0/demo.studenthalsa.se-shibboleth.xml
@@ -92,7 +92,7 @@ HHBppyJKzctyvImi8tjZKB5DkXgjJVieYtT/Mf72pMZipkdC9dW4XtaND8wyrPg=</ds:X509Certifi
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Jimmy</md:GivenName>
diff --git a/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index 3b97ca74..6710ef04 100644
--- a/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -57,8 +57,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
+    <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">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml
index f534c175..996a6978 100644
--- a/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/devsp.snd.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -57,8 +57,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
+    <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">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/fs.uka.se-adfs-services-trust.xml b/metadata/swamid-2.0/fs.uka.se-adfs-services-trust.xml
index 12e5d8fc..239491c3 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
@@ -54,10 +54,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.uka.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">UKA</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">UKÄ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Higher Education Authority</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Universitetskanslersämbetet</md:OrganizationDisplayName>
+    <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: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/idp.antagning.se-aws-idp.xml b/metadata/swamid-2.0/idp.antagning.se-aws-idp.xml
index 9f9c5aef..91435f30 100644
--- a/metadata/swamid-2.0/idp.antagning.se-aws-idp.xml
+++ b/metadata/swamid-2.0/idp.antagning.se-aws-idp.xml
@@ -55,7 +55,7 @@
     <md:OrganizationDisplayName xml:lang="sv">www.antagning.se</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">www.universityadmissions.se</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Universityadmissions.se</md:Company>
diff --git a/metadata/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
index 2f572318..a5df1415 100644
--- a/metadata/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
@@ -114,12 +114,12 @@ rIADMVp1l9/CW2HFplKrl4KFjGRpG/Ja2ghfza/Q6QsEYmLP0wJ3Z/bSZa7NfF6l
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå Universitet</md:Company>
diff --git a/metadata/swamid-2.0/jira-next.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
index 4736993e..173c990e 100644
--- a/metadata/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
@@ -112,11 +112,11 @@ kkF74aGqDdNQj8WhvVWDtw==
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå Universitet</md:Company>
diff --git a/metadata/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
index 93c14f75..a6a8b380 100644
--- a/metadata/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
@@ -112,11 +112,11 @@ LUM1EdYsX8qUyvMYoftcOdiik08=
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå Universitet</md:Company>
diff --git a/metadata/swamid-2.0/jira.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira.its.umu.se-shibboleth.xml
index 549d1d00..b1138d2b 100644
--- a/metadata/swamid-2.0/jira.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira.its.umu.se-shibboleth.xml
@@ -97,11 +97,11 @@ Y3EZrKlOUkTvtf9AZbwS+C7GtM1jaFHw20QR+l7f3/PYQS+hWEiHlgs=</ds:X509Certificate>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå Universitet</md:Company>
diff --git a/metadata/swamid-2.0/lis.ladok.se-shibboleth.xml b/metadata/swamid-2.0/lis.ladok.se-shibboleth.xml
index a8b316c3..6a6d07f6 100644
--- a/metadata/swamid-2.0/lis.ladok.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lis.ladok.se-shibboleth.xml
@@ -129,7 +129,7 @@ AAcRi0PH9J+6NCXpIQ==
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Olov</md:GivenName>
diff --git a/metadata/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
index 2ea4228d..6b9dc292 100644
--- a/metadata/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
@@ -101,11 +101,11 @@ t4sAFjL3EzEpVBBtvV7lMHO8Z+6Xqc7La0Auy6ZfZgovFyz919WkueKCdjGZXsJ3
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå Universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå Universitet</md:Company>
diff --git a/metadata/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml
index 561f70b1..69f964e7 100644
--- a/metadata/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml
@@ -115,7 +115,7 @@ gH37fw8xUTd60ieY8jI53ESUuj6qrV2mEOPh4IPwwRJuZe3HfgXqTbroSM8+r5zv
     <md:OrganizationDisplayName xml:lang="sv">Umeå unversitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå Universitet</md:Company>
diff --git a/metadata/swamid-2.0/play.fhs.se.xml b/metadata/swamid-2.0/play.fhs.se.xml
index 6d16494a..f53e03ee 100644
--- a/metadata/swamid-2.0/play.fhs.se.xml
+++ b/metadata/swamid-2.0/play.fhs.se.xml
@@ -42,11 +42,11 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.fhs.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Försvarshögskolan</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish Defence University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Försvarshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Defence University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.fhs.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university.html</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.fhs.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/play.shh.se.xml b/metadata/swamid-2.0/play.shh.se.xml
index cb74905b..7c82ac67 100644
--- a/metadata/swamid-2.0/play.shh.se.xml
+++ b/metadata/swamid-2.0/play.shh.se.xml
@@ -48,8 +48,8 @@
     <md:OrganizationName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://play.shh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://play.shh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.shh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.shh.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sophiahemmet University</md:GivenName>
diff --git a/metadata/swamid-2.0/se.timeedit.net-fhs-staff.xml b/metadata/swamid-2.0/se.timeedit.net-fhs-staff.xml
index 622d833a..a3c1e647 100644
--- a/metadata/swamid-2.0/se.timeedit.net-fhs-staff.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-fhs-staff.xml
@@ -50,8 +50,8 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Defence University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university.html</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.fhs.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.fhs.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
diff --git a/metadata/swamid-2.0/se.timeedit.net-fhs-stud.xml b/metadata/swamid-2.0/se.timeedit.net-fhs-stud.xml
index 663053dc..804d7750 100644
--- a/metadata/swamid-2.0/se.timeedit.net-fhs-stud.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-fhs-stud.xml
@@ -50,8 +50,8 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Defence University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university.html</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.fhs.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.fhs.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
diff --git a/metadata/swamid-2.0/se.timeedit.net-hhs-staff.xml b/metadata/swamid-2.0/se.timeedit.net-hhs-staff.xml
index 93feb7db..0677e04d 100644
--- a/metadata/swamid-2.0/se.timeedit.net-hhs-staff.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-hhs-staff.xml
@@ -56,8 +56,8 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">TimeEdit AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">TimeEdit AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">TimeEdit AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.timeedit.com</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.timeedit.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.timeedit.com/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
diff --git a/metadata/swamid-2.0/se.timeedit.net-hhs-stud.xml b/metadata/swamid-2.0/se.timeedit.net-hhs-stud.xml
index e160ca60..51b12d74 100644
--- a/metadata/swamid-2.0/se.timeedit.net-hhs-stud.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-hhs-stud.xml
@@ -56,8 +56,8 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">TimeEdit AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">TimeEdit AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">TimeEdit AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.timeedit.com</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.timeedit.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.timeedit.com/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
diff --git a/metadata/swamid-2.0/se.timeedit.net-kau-employee-sp.xml b/metadata/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
index 8fe1accf..07da9ee9 100644
--- a/metadata/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
@@ -56,8 +56,8 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">Timeedit AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Timeedit AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Timeedit AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.timeedit.com</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.timeedit.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.timeedit.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
diff --git a/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml b/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
index c0bd1c10..fb4831c2 100644
--- a/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
@@ -56,8 +56,8 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Timeedit AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Timeedit AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Timeedit AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.timeedit.com</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.timeedit.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.timeedit.com/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
diff --git a/metadata/swamid-2.0/uhrporten.se-shibboleth.xml b/metadata/swamid-2.0/uhrporten.se-shibboleth.xml
index ffec97d6..ac534763 100644
--- a/metadata/swamid-2.0/uhrporten.se-shibboleth.xml
+++ b/metadata/swamid-2.0/uhrporten.se-shibboleth.xml
@@ -127,7 +127,7 @@ LsSHnw5iDlrctxuIKBTKUp1TBf3/eA==</ds:X509Certificate>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Jimmy</md:GivenName>
diff --git a/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml b/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
index 827bd883..12fd6ebd 100644
--- a/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
@@ -54,7 +54,7 @@
     <md:OrganizationName xml:lang="en">Umeå university</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå university</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://umu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/visp.humlab.umu.se.xml b/metadata/swamid-2.0/visp.humlab.umu.se.xml
index 97212aa9..876fb79f 100644
--- a/metadata/swamid-2.0/visp.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/visp.humlab.umu.se.xml
@@ -76,7 +76,7 @@
     <md:OrganizationName xml:lang="en">Umeå university</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå university</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.umu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
index e99efec9..92e35b2c 100644
--- a/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
@@ -110,7 +110,7 @@
     <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml b/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
index 51c7315f..2793c846 100644
--- a/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
@@ -75,7 +75,7 @@
     <md:OrganizationDisplayName xml:lang="en">Swedish Defence University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.fhs.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.fhs.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>Swedish Defence University</md:Company>
diff --git a/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index 16d12f39..9c29517e 100644
--- a/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -55,8 +55,8 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
+    <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">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
diff --git a/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
index cdb04a12..65ca590b 100644
--- a/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
@@ -132,7 +132,7 @@
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">