Corrected use of OrganizationName and OrganizationDisplayName, more to come.

25 files changed, 58 insertions, 58 deletions

diff --git a/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
index 827ced8a..84f59909 100644
--- a/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
@@ -112,10 +112,10 @@ hqj4vsnmj5P2D3MHXocrWkPzxg==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
index a0ecfae3..2bae577a 100644
--- a/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
@@ -110,10 +110,10 @@ rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml b/metadata/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
index a8b3f385..80226c00 100644
--- a/metadata/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
+++ b/metadata/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
@@ -103,9 +103,9 @@ r4+XgT0UL7OozzUEVXEMuIxRaSwo+CtUnWoZjlVi813gHPGYl2F29OeEkGIYJU+N
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+    <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:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/dev.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
index a42d7427..57008391 100644
--- a/metadata/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
@@ -105,10 +105,10 @@ JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
     <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:Organization>
diff --git a/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
index 2a65e596..2071af17 100644
--- a/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
@@ -106,10 +106,10 @@ JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
     <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:Organization>
diff --git a/metadata/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml b/metadata/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
index 971fb630..b497843d 100644
--- a/metadata/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
+++ b/metadata/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
@@ -103,9 +103,9 @@ kGv/tac9fcTDGjZ7</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
+    <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:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/metadata/swamid-2.0/expert.stage.antagning.se-expert-sp.xml b/metadata/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
index 5c270917..fbbac57a 100644
--- a/metadata/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
+++ b/metadata/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
@@ -102,12 +102,12 @@ f1cDewNLTKiWGbUkZ9Y8Fw==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uhr.se</md:OrganizationURL>
+    <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:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Antagning.se</md:Company>
diff --git a/metadata/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml b/metadata/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
index 8285d3f5..a74e98ff 100644
--- a/metadata/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
+++ b/metadata/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
@@ -104,9 +104,9 @@ ypVCZ86nE2K76dkQ2zhOD5qKrFYtl71Nak6Rm81UIA==</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uhr.se</md:OrganizationURL>
+    <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:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>NyAdrift</md:Company>
diff --git a/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
index d22a70a0..bec22697 100644
--- a/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
@@ -94,8 +94,8 @@ x642c5iHKr2d/SOMA05pL7Qz4RB2fDIgmPg6VzglrkKBYVHUIi3a1j5dBA==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Svenska Universitetsdatornätverket</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml b/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
index 03e609b7..45710d82 100644
--- a/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
@@ -100,8 +100,8 @@ uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Svenska Universitetsdatornätverk</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/idp.test.antagning.se-aws-idp.xml b/metadata/swamid-2.0/idp.test.antagning.se-aws-idp.xml
index b97ff133..b8290f67 100644
--- a/metadata/swamid-2.0/idp.test.antagning.se-aws-idp.xml
+++ b/metadata/swamid-2.0/idp.test.antagning.se-aws-idp.xml
@@ -53,8 +53,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Antagning.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universityadmissions.se</md:OrganizationDisplayName>
+    <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:Organization>
diff --git a/metadata/swamid-2.0/intranet.nai.uu.se.xml b/metadata/swamid-2.0/intranet.nai.uu.se.xml
index de7c7bb1..32ded912 100644
--- a/metadata/swamid-2.0/intranet.nai.uu.se.xml
+++ b/metadata/swamid-2.0/intranet.nai.uu.se.xml
@@ -101,8 +101,8 @@ A1WpoKvis3tADeCopGWjRLdYTCSWXdPgUZcj</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Nordiska Afrikainstitutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">The Nordic Africa Institute</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Nordiska Afrikainstitutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://intranet.nai.uu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://intranet.nai.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://nai.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://nai.uu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Nordiska Afrikainstitutet</md:Company>
diff --git a/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
index e0a966d0..6899d66a 100644
--- a/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
@@ -101,8 +101,8 @@ iwGo/TqTT5u0WBmEbv41WKYpqfeaOw8wGnkg8qSarChrIBXNJkfZmxAz8P6Xp0Ig
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Svenska Universitetsdatornätverket</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml b/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
index abc47a48..2c7f4346 100644
--- a/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
@@ -99,8 +99,8 @@ pVHC0z9N3EFKt9RGKKG/Jbk4mSpbYCU=
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Svenska Universitetsdatornätverket</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/metadata/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index d4b258fb..5258a25f 100644
--- a/metadata/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/metadata/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -150,7 +150,7 @@ UIW4Y6GzlL7EfXr31lnv</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
     <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</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="administrative">
diff --git a/metadata/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml b/metadata/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
index 60429f16..cb5b1a4c 100644
--- a/metadata/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
@@ -100,11 +100,11 @@ gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==</ds:X509Certifi
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uhr.se</md:OrganizationURL>
+    <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:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
index b7e381b2..485d9710 100644
--- a/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
@@ -107,10 +107,10 @@ BwquFopAQg==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
     <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:Organization>
diff --git a/metadata/swamid-2.0/uhr-build.its.umu.se-jenkins-sp.xml b/metadata/swamid-2.0/uhr-build.its.umu.se-jenkins-sp.xml
index a5918f8a..064b3d38 100644
--- a/metadata/swamid-2.0/uhr-build.its.umu.se-jenkins-sp.xml
+++ b/metadata/swamid-2.0/uhr-build.its.umu.se-jenkins-sp.xml
@@ -105,12 +105,12 @@ w1Q6jg+/sw==</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">UHR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">UHR</md:OrganizationDisplayName>
+    <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="support">
     <md:Company>NyA-projektet</md:Company>
diff --git a/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
index 5dfe38cf..d48aa034 100644
--- a/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
@@ -111,10 +111,10 @@ RrcgAwWR573F+C6Cqrt89uDpyQ8ZM2Z+LZdIvrhBYV/lO7Dk9uZF2d9f7ew48DeA
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
index 9eabca46..e24d19ce 100644
--- a/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
@@ -103,10 +103,10 @@ MViWUqDxKicGyuokDNf3hpcc9w==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml b/metadata/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
index 77fa935d..80305ddd 100644
--- a/metadata/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
@@ -97,11 +97,11 @@ OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">TEST Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">TEST Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">TEST Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">TEST Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+    <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:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-edugain/idp-shib.slu.se-idp.xml b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
index 100bea1f..05fc5beb 100644
--- a/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
+++ b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
@@ -236,7 +236,7 @@ ffEVzH+iKOe5hd6R</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.slu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.slu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml b/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml
index 81a2a949..b31287a2 100644
--- a/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml
+++ b/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml
@@ -54,8 +54,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Antagning.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universityadmissions.se</md:OrganizationDisplayName>
+    <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:Organization>
diff --git a/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml b/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
index 2ac504c5..65270521 100644
--- a/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
+++ b/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
@@ -68,8 +68,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Antagning.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universityadmissions.se</md:OrganizationDisplayName>
+    <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:Organization>
diff --git a/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml b/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
index 3dd65086..761cadf8 100644
--- a/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
@@ -245,7 +245,7 @@ TXTmDToCsU6Qmj1SCQ==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
     <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</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="administrative">