Corrected use of OrganizationName and OrganizationDisplayName, more to come.md-2024-02-20-v01

43 files changed, 90 insertions, 90 deletions

diff --git a/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml b/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
index 67b6a979..7b541868 100644
--- a/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
+++ b/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
@@ -85,8 +85,8 @@
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Sunet</md:Company>
diff --git a/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml b/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml
index 51a9c085..0ed3ee55 100644
--- a/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml
+++ b/metadata/swamid-2.0/bankid.eduid.se-saml2-metadata.xml
@@ -129,8 +129,8 @@ GETOy+U=</ds:X509Certificate>
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Vetenskapsrådet</md:Company>
diff --git a/metadata/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml
index 93f24482..72b10483 100644
--- a/metadata/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml
@@ -75,8 +75,8 @@
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Technical</md:GivenName>
diff --git a/metadata/swamid-2.0/crowd-test.sunet.se-shibboleth.xml b/metadata/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
index 65f32ec7..7daf706c 100644
--- a/metadata/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
@@ -123,8 +123,8 @@ Management</md:ServiceName>
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-2.0/demo.uhrporten.se-shibboleth.xml b/metadata/swamid-2.0/demo.uhrporten.se-shibboleth.xml
index 8b9d64ce..4d09ab2e 100644
--- a/metadata/swamid-2.0/demo.uhrporten.se-shibboleth.xml
+++ b/metadata/swamid-2.0/demo.uhrporten.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/graylog.sunet.se-shibboleth.xml b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
index bec22697..bfc83d01 100644
--- a/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
@@ -98,8 +98,8 @@ x642c5iHKr2d/SOMA05pL7Qz4RB2fDIgmPg6VzglrkKBYVHUIi3a1j5dBA==
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>SUNET</md:Company>
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 45710d82..6a1de90c 100644
--- a/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
@@ -104,8 +104,8 @@ uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Tomas</md:GivenName>
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 91435f30..e8a61c3c 100644
--- a/metadata/swamid-2.0/idp.antagning.se-aws-idp.xml
+++ b/metadata/swamid-2.0/idp.antagning.se-aws-idp.xml
@@ -52,8 +52,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">www.antagning.se</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">www.universityadmissions.se</md:OrganizationDisplayName>
+    <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">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/kontrollpanelen.sunet.se-shibboleth.xml b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
index 6899d66a..b3f02b9b 100644
--- a/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
@@ -105,8 +105,8 @@ iwGo/TqTT5u0WBmEbv41WKYpqfeaOw8wGnkg8qSarChrIBXNJkfZmxAz8P6Xp0Ig
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>SUNET</md:Company>
diff --git a/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml b/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml
index b36d466e..7a719703 100644
--- a/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lookup.cert.sunet.se-shibboleth.xml
@@ -96,8 +96,8 @@ fnhrbIJZk17LO1uBkDd6DCG3AXHvOufHGIi+pzM9epF91CkEUiEHag==</ds:X509Certificate>
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>SUNET</md:Company>
diff --git a/metadata/swamid-2.0/matrix-test-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/matrix-test-idp-proxy.sunet.se-sp.xml
index 2fb6c872..e83e7fbb 100644
--- a/metadata/swamid-2.0/matrix-test-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/matrix-test-idp-proxy.sunet.se-sp.xml
@@ -70,12 +70,12 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SUNET</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="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Technical</md:GivenName>
diff --git a/metadata/swamid-2.0/meta2.eduroam.se.xml b/metadata/swamid-2.0/meta2.eduroam.se.xml
index 08aaf799..3c016aba 100644
--- a/metadata/swamid-2.0/meta2.eduroam.se.xml
+++ b/metadata/swamid-2.0/meta2.eduroam.se.xml
@@ -106,8 +106,8 @@ GrCXc5ZoCHOTZu74wHNT5vyrZ6BxlA==
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Kristofer</md:GivenName>
diff --git a/metadata/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml
index 8b803248..8d4c286f 100644
--- a/metadata/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml
@@ -131,7 +131,7 @@ f+9S5SY5Jw==
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>SUNET</md:Company>
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 2c7f4346..97baa545 100644
--- a/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
@@ -103,8 +103,8 @@ pVHC0z9N3EFKt9RGKKG/Jbk4mSpbYCU=
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>SUNET</md:Company>
diff --git a/metadata/swamid-2.0/monitor.drive.sunet.se.xml b/metadata/swamid-2.0/monitor.drive.sunet.se.xml
index afd31911..a6048d87 100644
--- a/metadata/swamid-2.0/monitor.drive.sunet.se.xml
+++ b/metadata/swamid-2.0/monitor.drive.sunet.se.xml
@@ -104,8 +104,8 @@ z/QsGzzJUZ8kxiKY4Z0zoKQnIwb1K0a8f6g=
     <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.vr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Sunet Drive</md:GivenName>
diff --git a/metadata/swamid-2.0/monitor.drive.test.sunet.se.xml b/metadata/swamid-2.0/monitor.drive.test.sunet.se.xml
index 23962412..b148089d 100644
--- a/metadata/swamid-2.0/monitor.drive.test.sunet.se.xml
+++ b/metadata/swamid-2.0/monitor.drive.test.sunet.se.xml
@@ -104,8 +104,8 @@ ABkHwAnvWdqh/NqOhZ8DoXkwIWW7cgeoWr0=
     <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.vr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Sunet Drive</md:GivenName>
diff --git a/metadata/swamid-2.0/monitor.social.sunet.se.xml b/metadata/swamid-2.0/monitor.social.sunet.se.xml
index 454531b4..394fa09c 100644
--- a/metadata/swamid-2.0/monitor.social.sunet.se.xml
+++ b/metadata/swamid-2.0/monitor.social.sunet.se.xml
@@ -102,8 +102,8 @@ n6bYyeq+VMdgSUwTD+fDP+tRVu9eRPVh5t8=</ds:X509Certificate>
     <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.vr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Sunet Social</md:GivenName>
diff --git a/metadata/swamid-2.0/ni.sunet.se-saml2-metadata-.xml b/metadata/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
index 87fd5b3d..7da07994 100644
--- a/metadata/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
@@ -86,8 +86,8 @@ aRl22guR2G2MeQtvNn+JuYRmrJbW8xi5mXCQkps2TvQfiVLHAzCIpXUZANpnS582
   <md:Organization>
     <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:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml b/metadata/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml
index bdd66b56..6c73f5ef 100644
--- a/metadata/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml
@@ -103,10 +103,10 @@ QU6xVdN5omLgRNLW2bpV9wvZRQYfA6IH+hV0X89zKy8=</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-2.0/norpan-sso-proxy.cnaas.sunet.se-sp.xml b/metadata/swamid-2.0/norpan-sso-proxy.cnaas.sunet.se-sp.xml
index f113db9d..43773fbb 100644
--- a/metadata/swamid-2.0/norpan-sso-proxy.cnaas.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/norpan-sso-proxy.cnaas.sunet.se-sp.xml
@@ -67,8 +67,8 @@
     <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/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sunet NOC</md:GivenName>
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 69f964e7..30c0c4b2 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
@@ -110,10 +110,10 @@ gH37fw8xUTd60ieY8jI53ESUuj6qrV2mEOPh4IPwwRJuZe3HfgXqTbroSM8+r5zv
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Umeå unversitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Umeå University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå unversitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Umea University</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:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
index 6e118b46..9f420937 100644
--- a/metadata/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
@@ -130,8 +130,8 @@ TkzG7ocEUA==
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-2.0/play.sunet.se.xml b/metadata/swamid-2.0/play.sunet.se.xml
index 8e9273d8..216addfb 100644
--- a/metadata/swamid-2.0/play.sunet.se.xml
+++ b/metadata/swamid-2.0/play.sunet.se.xml
@@ -46,8 +46,8 @@
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>Administrator</md:SurName>
diff --git a/metadata/swamid-2.0/rt-test.sunet.se-shibboleth.xml b/metadata/swamid-2.0/rt-test.sunet.se-shibboleth.xml
index bebcbd4e..f07553c2 100644
--- a/metadata/swamid-2.0/rt-test.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/rt-test.sunet.se-shibboleth.xml
@@ -109,8 +109,8 @@ qFDyEiYnvPNe95CFpLV4ccxmu+AyDyGOg8KnzgzOHIJZQRgUOMKI7qxeHQ==
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-2.0/rt.sunet.se-shibboleth.xml b/metadata/swamid-2.0/rt.sunet.se-shibboleth.xml
index 1c7176fe..c4330790 100644
--- a/metadata/swamid-2.0/rt.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/rt.sunet.se-shibboleth.xml
@@ -108,8 +108,8 @@ UJa1o8SLCiWTcxQc3uz1rXh/K6gjHos0nQMdyg==
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-2.0/shared-sso-proxy.cnaas.sunet.se-sp.xml b/metadata/swamid-2.0/shared-sso-proxy.cnaas.sunet.se-sp.xml
index c448611c..df6eac00 100644
--- a/metadata/swamid-2.0/shared-sso-proxy.cnaas.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/shared-sso-proxy.cnaas.sunet.se-sp.xml
@@ -67,8 +67,8 @@
     <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/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml b/metadata/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
index 6b92b966..329a709a 100644
--- a/metadata/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
+++ b/metadata/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
@@ -124,8 +124,8 @@ pBOTVcS/h6P15LAjUglZDQ==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Turnitin</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Turnitin</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Turnitin LLC</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Turnitin LLC</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Turnitin</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Turnitin</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.turnitin.com/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml b/metadata/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml
index c24e3b1b..aa279cd1 100644
--- a/metadata/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml
@@ -119,8 +119,8 @@ Vqi/B2Y7fjullgT4vvCWaaFAzeS9hYxpZMeX8vgXnqDfecQxQowhFAfRKAaOvY6/
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml b/metadata/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
index 99769feb..4959c89b 100644
--- a/metadata/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
@@ -125,10 +125,10 @@ u2DILJFDHG6NsygDB5HF7t4kMRyVy/xI+dAe80+WmjLKM33ybwW/suk=
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>SUNET</md:Company>
diff --git a/metadata/swamid-2.0/sunet.instructure.com-saml2.xml b/metadata/swamid-2.0/sunet.instructure.com-saml2.xml
index 3b640f72..c95de11b 100644
--- a/metadata/swamid-2.0/sunet.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/sunet.instructure.com-saml2.xml
@@ -106,8 +106,8 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.vr.se/english.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>Sunet NOC</md:SurName>
diff --git a/metadata/swamid-2.0/update-connect.sunet.se-shibboleth.xml b/metadata/swamid-2.0/update-connect.sunet.se-shibboleth.xml
index 756271a4..515c17b6 100644
--- a/metadata/swamid-2.0/update-connect.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/update-connect.sunet.se-shibboleth.xml
@@ -155,8 +155,8 @@ poFuABRVWaoZFxw=</ds:X509Certificate>
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Technical</md:GivenName>
diff --git a/metadata/swamid-2.0/verify.sunet.se-shibboleth.xml b/metadata/swamid-2.0/verify.sunet.se-shibboleth.xml
index ab9c3077..666e45d0 100644
--- a/metadata/swamid-2.0/verify.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/verify.sunet.se-shibboleth.xml
@@ -151,8 +151,8 @@ oL2bH818Ft93Y/h4EFUtHZPG6PQB3dLchU/7yxJGq2+NQEmPEUS6VhHglyla5tUh
     <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/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-edugain/crowd.sunet.se-shibboleth.xml b/metadata/swamid-edugain/crowd.sunet.se-shibboleth.xml
index 73392372..864b0f98 100644
--- a/metadata/swamid-edugain/crowd.sunet.se-shibboleth.xml
+++ b/metadata/swamid-edugain/crowd.sunet.se-shibboleth.xml
@@ -107,8 +107,8 @@ Management</md:ServiceName>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Sunet NOC</md:GivenName>
diff --git a/metadata/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml b/metadata/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml
index 3fbd12f8..3bbe937b 100644
--- a/metadata/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml
@@ -121,8 +121,8 @@ nFazsTrNSZlEGo3j2eQJF+jcoe/dBg/fTJkDpehuCObZ6KOCGBIiYSu6wISlbti9
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Richard Freitag</md:GivenName>
diff --git a/metadata/swamid-edugain/edusign.sunet.se-shibboleth.xml b/metadata/swamid-edugain/edusign.sunet.se-shibboleth.xml
index 630e2ca0..64a9150e 100644
--- a/metadata/swamid-edugain/edusign.sunet.se-shibboleth.xml
+++ b/metadata/swamid-edugain/edusign.sunet.se-shibboleth.xml
@@ -137,8 +137,8 @@ q6i3w8KKR5Zi4g5QHRTk1QFroyidLA==</ds:X509Certificate>
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>SUNET</md:GivenName>
diff --git a/metadata/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml b/metadata/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml
index 18582672..4122ae4c 100644
--- a/metadata/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml
+++ b/metadata/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml
@@ -120,7 +120,7 @@ bn4dcALpOQ==
     <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:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/login.idp.eduid.se-idp.xml.xml b/metadata/swamid-edugain/login.idp.eduid.se-idp.xml.xml
index 10e3ffe2..4630eea1 100644
--- a/metadata/swamid-edugain/login.idp.eduid.se-idp.xml.xml
+++ b/metadata/swamid-edugain/login.idp.eduid.se-idp.xml.xml
@@ -84,8 +84,8 @@ RVtD2xG8+6W5O+PpWCZOnshCVVSv4c3UmUSJt1nEEr4FJUdugvnAojwsxCjBabA=</ds:X509Certifi
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Zacharias</md:GivenName>
diff --git a/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml b/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
index e4058ce3..f5a9eb82 100644
--- a/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
+++ b/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
@@ -112,8 +112,8 @@ SjR0JMXpw1VGuEcbAipJR5DLZcHmAUL/CnC4H6VMBk3YcWbDMrXBp6lMYBZ+jUMG
   <md:Organization>
     <md:OrganizationName xml:lang="en">Prio Infocenter AB</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Prio Infocenter AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Prio Infocenter AB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Prio Infocenter AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ouriginal Group AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ouriginal Group AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.ouriginal.com/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.ouriginal.com/sv/</md:OrganizationURL>
   </md:Organization>
diff --git a/metadata/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml b/metadata/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml
index 02c186ed..1faf18fa 100644
--- a/metadata/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml
+++ b/metadata/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml
@@ -53,8 +53,8 @@
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>SUNET</md:GivenName>
diff --git a/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-geant-test.xml b/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-geant-test.xml
index c9bfe715..ec6a7e9e 100644
--- a/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-geant-test.xml
+++ b/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-geant-test.xml
@@ -61,8 +61,8 @@
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>SUNET</md:GivenName>
diff --git a/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-test.xml b/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-test.xml
index 83606721..306d24ad 100644
--- a/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-test.xml
+++ b/metadata/swamid-edugain/signservice.test.edusign.sunet.se-edusign-test.xml
@@ -61,8 +61,8 @@
     <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>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>SUNET</md:GivenName>
diff --git a/metadata/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml b/metadata/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
index 5896bc3b..52bf787e 100644
--- a/metadata/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
@@ -157,8 +157,8 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
     <md:OrganizationName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.shh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.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="administrative">
     <md:Company>Sophiahemmet University</md:Company>
diff --git a/metadata/swamid-edugain/test.edusign.sunet.se-shibboleth.xml b/metadata/swamid-edugain/test.edusign.sunet.se-shibboleth.xml
index 4a31545e..8c85e7b6 100644
--- a/metadata/swamid-edugain/test.edusign.sunet.se-shibboleth.xml
+++ b/metadata/swamid-edugain/test.edusign.sunet.se-shibboleth.xml
@@ -126,8 +126,8 @@ kQp3tttIwnZXxYdIEye53wndSAgU+cmVMc3qtWJbnLyn++bADg==
     <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>SUNET</md:GivenName>