syncup of mdui displayname and organization displayname

sv/en organizationDisplayName added for all IdP:s

49 files changed, 94 insertions, 53 deletions

diff --git a/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml
index 12076db4..c233af24 100644
--- a/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -53,9 +53,10 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv-SE">Försvarshögskolan</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv-SE">Försvarshögskolan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv-SE">http://www.fhs.se/</OrganizationURL>
+    <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Försvarshögskolan</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Alex</GivenName>
diff --git a/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml b/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
index d46497e5..e802d491 100644
--- a/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
+++ b/swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml
@@ -22,10 +22,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://callback-prod.inloggning.se/simplesaml/saml2/idp/ssos_7baf0ac137159c2b28aebc5956e46bff"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="se">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Handelshögskolan i Stockholm</md:OrganizationName>
     <md:OrganizationName xml:lang="no">Handelshögskolan i Stockholm</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/?page=idps#hhs</md:OrganizationURL>
   </md:Organization>
 </md:EntityDescriptor>
diff --git a/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml b/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml
index 4b8c87ac..4afcc378 100644
--- a/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml
+++ b/swamid-1.0/ecsidp.antagning.se-ecs-idp.xml
@@ -47,22 +47,13 @@ MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5h
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">
-			UHR
-		</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-			Swedish Council for Higher Education
-		</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-			http://www.uhr.se
-		</OrganizationURL>
+    <OrganizationName xml:lang="en">UHR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">NyA Expert-IdP (UHR)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NyA Expert-IdP (UHR)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <Company>
-			Swedish Council for Higher Education
-		</Company>
-    <EmailAddress>
-			appldrift_saml@uhr.se
-		</EmailAddress>
+    <Company>Swedish Council for Higher Education</Company>
+    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml
index 2410b430..33827785 100644
--- a/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-1.0/hbidp.hb.se-idp-shibboleth.xml
@@ -4,10 +4,10 @@
     <Extensions>
       <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
         <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
@@ -126,7 +126,8 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HB</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Högskolan i Borås</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/identity.mdh.se-idp-shibboleth.xml b/swamid-1.0/identity.mdh.se-idp-shibboleth.xml
index 3ac77e3e..c1c2df60 100644
--- a/swamid-1.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-1.0/identity.mdh.se-idp-shibboleth.xml
@@ -88,6 +88,7 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">MDH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Mälardalens högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml b/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml
index 0886f1b2..a7974ef5 100644
--- a/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp-test.kau.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KAUTEST</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Karlstads universitet (Test IdP)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Karlstad university (Test IdP)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml
index 7a77a589..d6687c6c 100644
--- a/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml
+++ b/swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml
@@ -86,6 +86,7 @@ X627IsSkKg==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">NORDUnetTEST</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">NORDUnet (Test IdP)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">NORDUnet (Test IdP)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.bth.se-idp-shibboleth.xml b/swamid-1.0/idp.bth.se-idp-shibboleth.xml
index 879f8670..2f295c0a 100644
--- a/swamid-1.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.bth.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">BTH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml
index 766bf3c6..df1df92d 100644
--- a/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-1.0/idp.chalmers.se-adfs-services-trust.xml
@@ -317,6 +317,7 @@
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">CHALMERS</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Chalmers</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Chalmers</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.chalmers.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.hgo.se-idp-shibboleth.xml b/swamid-1.0/idp.hgo.se-idp-shibboleth.xml
index c861ac14..ebf390a0 100644
--- a/swamid-1.0/idp.hgo.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.hgo.se-idp-shibboleth.xml
@@ -78,6 +78,7 @@ UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HGO</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan på Gotland</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Högskolan på Gotland</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hgo.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.hig.se-idp-shibboleth.xml b/swamid-1.0/idp.hig.se-idp-shibboleth.xml
index 418e5e69..66dfc41d 100644
--- a/swamid-1.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.hig.se-idp-shibboleth.xml
@@ -90,6 +90,7 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HIG</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Högskolan i Gävle</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.his.se-idp-shibboleth.xml b/swamid-1.0/idp.his.se-idp-shibboleth.xml
index c4670149..1db9a802 100644
--- a/swamid-1.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.his.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HIS</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Högskolan i Skövde</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.his.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.hkr.se-idp-shibboleth.xml b/swamid-1.0/idp.hkr.se-idp-shibboleth.xml
index d88772b4..58110b89 100644
--- a/swamid-1.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.hkr.se-idp-shibboleth.xml
@@ -78,6 +78,7 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HKR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Högskolan Kristianstad</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hkr.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.irf.se-idp-shibboleth.xml b/swamid-1.0/idp.irf.se-idp-shibboleth.xml
index 3bc56d52..595ca01a 100644
--- a/swamid-1.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.irf.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">IRF</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Institutet för Rymdfysik</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml
index 589c1f58..f2e3f4ba 100644
--- a/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.it.gu.se-idp-shibboleth.xml
@@ -88,7 +88,8 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">GU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Göteborgs universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Göteborgs universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/idp.it.su.se-idp-shibboleth.xml b/swamid-1.0/idp.it.su.se-idp-shibboleth.xml
index f8eeb2a2..7ef6e36a 100644
--- a/swamid-1.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.it.su.se-idp-shibboleth.xml
@@ -80,6 +80,7 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">SU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Stockholms universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.kmh.se-idp-shibboleth.xml b/swamid-1.0/idp.kmh.se-idp-shibboleth.xml
index 1ffb44f3..5bf46b5c 100644
--- a/swamid-1.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.kmh.se-idp-shibboleth.xml
@@ -72,6 +72,7 @@ Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KMH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Kungliga Musikhögskolan</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kmh.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml
index eec09d93..9e2929f7 100644
--- a/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.konstfack.se-idp-shibboleth.xml
@@ -72,6 +72,7 @@ SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certifi
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Konstfack</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Konstfack</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Konstfack</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.konstfack.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.lnu.se-idp-shibboleth.xml b/swamid-1.0/idp.lnu.se-idp-shibboleth.xml
index db815b90..3f6ab92b 100644
--- a/swamid-1.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.lnu.se-idp-shibboleth.xml
@@ -103,7 +103,8 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LNU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Linnéuniversitetet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Linnæus University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.lnu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/idp.mah.se-idp-shibboleth.xml b/swamid-1.0/idp.mah.se-idp-shibboleth.xml
index 55b95bbc..a36807b7 100644
--- a/swamid-1.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.mah.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">MAH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Malmö Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Malmö Högskola</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.mah.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.nordu.net-idp-shibboleth.xml b/swamid-1.0/idp.nordu.net-idp-shibboleth.xml
index 13f1088e..4482716b 100644
--- a/swamid-1.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-1.0/idp.nordu.net-idp-shibboleth.xml
@@ -84,6 +84,7 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">NORDUnet</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">NORDUnet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.rkh.se-idp-shibboleth.xml b/swamid-1.0/idp.rkh.se-idp-shibboleth.xml
index e0873003..3d91bc1d 100644
--- a/swamid-1.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.rkh.se-idp-shibboleth.xml
@@ -70,6 +70,7 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">The Red Cross University College</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Red Cross University College</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.rkh.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.secure.su.se-identity.xml b/swamid-1.0/idp.secure.su.se-identity.xml
index 64d32d23..8a35a330 100644
--- a/swamid-1.0/idp.secure.su.se-identity.xml
+++ b/swamid-1.0/idp.secure.su.se-identity.xml
@@ -31,6 +31,7 @@
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">SUOLD</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Stockholms universitet (gamla inloggningen)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Stockholm University (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml
index 15d5f744..43dee78a 100644
--- a/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp.student.bth.se-idp-shibboleth.xml
@@ -72,6 +72,7 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">STUDENTS-BTH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp.suni.se-adfs-services-trust.xml b/swamid-1.0/idp.suni.se-adfs-services-trust.xml
index 87016da9..51abc196 100644
--- a/swamid-1.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-1.0/idp.suni.se-adfs-services-trust.xml
@@ -65,9 +65,10 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv-SE">Södertörns högskola</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv-SE">Södertörns högskola</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv-SE">http://www.sh.se/</OrganizationURL>
+    <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Södertörns högskola</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Södertörns högskola</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.sh.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Tomas</GivenName>
diff --git a/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml
index 5650f360..cb4bacaf 100644
--- a/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -24,12 +24,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
+    <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
-    <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Umeå universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Datordrift</md:SurName>
diff --git a/swamid-1.0/idp2.hig.se-idp-shibboleth.xml b/swamid-1.0/idp2.hig.se-idp-shibboleth.xml
index 86717c23..b67b614b 100644
--- a/swamid-1.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp2.hig.se-idp-shibboleth.xml
@@ -83,7 +83,8 @@ aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HIGALUMNI</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Högskolan i Gävle (Alumni)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Gävle (Alumni)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/idp2.hv.se-idp-shibboleth.xml b/swamid-1.0/idp2.hv.se-idp-shibboleth.xml
index e29ce4b4..31953416 100644
--- a/swamid-1.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp2.hv.se-idp-shibboleth.xml
@@ -87,12 +87,12 @@ aRQKNbVQdPN5ht6TrINjDQ==
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">HV</OrganizationName>
     <OrganizationName xml:lang="sv">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">HV</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
+    <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>Högskolan Väst</Company>
diff --git a/swamid-1.0/idp2.kau.se-idp-shibboleth.xml b/swamid-1.0/idp2.kau.se-idp-shibboleth.xml
index a07393bf..c383f0e0 100644
--- a/swamid-1.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp2.kau.se-idp-shibboleth.xml
@@ -95,6 +95,7 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KAU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Karlstads universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/idp3.hv.se-idp-shibboleth.xml b/swamid-1.0/idp3.hv.se-idp-shibboleth.xml
index e0edfb9e..6f085338 100644
--- a/swamid-1.0/idp3.hv.se-idp-shibboleth.xml
+++ b/swamid-1.0/idp3.hv.se-idp-shibboleth.xml
@@ -87,12 +87,12 @@ skz1W+/eg2IbITbz88uIXA==
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">HV</OrganizationName>
     <OrganizationName xml:lang="sv">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University West (Test)</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">HV</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan Väst (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
+    <OrganizationDisplayName xml:lang="en">University West (Test)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>Högskolan Väst</Company>
diff --git a/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml
index 09d36b3b..715f62a5 100644
--- a/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml
+++ b/swamid-1.0/kiidp.ki.se-idp-shibboleth.xml
@@ -102,6 +102,7 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml
index 4c7cdd0c..754d3c51 100644
--- a/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml
+++ b/swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml
@@ -78,6 +78,7 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">VR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Vetenskapsrådet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/login.du.se-idp-shibboleth.xml b/swamid-1.0/login.du.se-idp-shibboleth.xml
index 309598c1..97bdb37b 100644
--- a/swamid-1.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-1.0/login.du.se-idp-shibboleth.xml
@@ -90,7 +90,8 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">DU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Högskolan Dalarna</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/login.liu.se-idp-shibboleth.xml b/swamid-1.0/login.liu.se-idp-shibboleth.xml
index ee4b1136..6d30b43f 100644
--- a/swamid-1.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-1.0/login.liu.se-idp-shibboleth.xml
@@ -95,12 +95,12 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">LiU</OrganizationName>
     <OrganizationName xml:lang="sv">LiU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">LiU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
+    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>Linköping University</Company>
diff --git a/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml
index d9c35284..4294f39f 100644
--- a/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml
@@ -4,6 +4,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The KTH Royal Institute of Technology</mdui:DisplayName>
         <mdui:Description xml:lang="en">The KTH Royal Institute of Technology Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://saml-1.sys.kth.se/om.html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://saml-1.sys.kth.se/about.html</mdui:InformationURL>
@@ -111,7 +113,8 @@ sdhdXg==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kungliga Tekniska högskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The KTH Royal Institute of Technology</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml
index 1533c284..a9387226 100644
--- a/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -83,6 +83,7 @@ Pz8R3A==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">ORU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Örebro Universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Örebro Universitet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml
index 69ecb138..d134db49 100644
--- a/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-1.0/shibb1.hj.se-idp-shibboleth.xml
@@ -88,7 +88,8 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HJ</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Högskolan i Jönköping</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml
index 6ed98b93..3ad8de89 100644
--- a/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LTU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Luleå tekniska universitet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml b/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml
index f2889a80..03ff0244 100644
--- a/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml
+++ b/swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml
@@ -78,6 +78,7 @@ ADE1bHKRi4qX9DYfBN7g
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">LU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Lunds universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Lunds universitet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.lu.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml b/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml
index b9aea074..660e76dc 100644
--- a/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml
+++ b/swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml
@@ -80,8 +80,8 @@ xpmbgA==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science (OLD)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (OLD)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (gamla inloggningen)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml b/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml
index e7ee9875..4e467bbb 100644
--- a/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml
+++ b/swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml
@@ -96,6 +96,7 @@ jztUvasgi2c=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">VHS</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Verket för Högskoleservice</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Verket för Högskoleservice</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.vhs.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/signon.hh.se-idp-shibboleth.xml b/swamid-1.0/signon.hh.se-idp-shibboleth.xml
index c537e83e..6496746f 100644
--- a/swamid-1.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-1.0/signon.hh.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Högskolan i Halmstad</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/swamid.shh.se-idp-shibboleth.xml b/swamid-1.0/swamid.shh.se-idp-shibboleth.xml
index f58261c1..48893bf0 100644
--- a/swamid-1.0/swamid.shh.se-idp-shibboleth.xml
+++ b/swamid-1.0/swamid.shh.se-idp-shibboleth.xml
@@ -78,6 +78,7 @@ GOv94FinTmMj7OUnqdHESZ1zpL6NB5KXFAtRXatuzFYE+g8gO1AQg83/kjlbNeM7
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">SOPHIA</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Sophiahemmets Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Sophiahemmets Högskola</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.sophia.se</OrganizationURL>
   </Organization>
diff --git a/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml b/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml
index 819cc499..e9c6982f 100644
--- a/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml
+++ b/swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml
@@ -100,7 +100,8 @@ L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml
index 7ed92556..1cbd7e2a 100644
--- a/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -76,6 +76,7 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">MIUN</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 0b75b816..b4769dc9 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -316,9 +316,10 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv-SE">Linköping University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv-SE">Linköping University (ADFS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv-SE">http://www.liu.se/</OrganizationURL>
+    <OrganizationName xml:lang="sv">Linköping University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Linköping University (ADFS)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Johan</GivenName>
diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
index 5e57f0d0..80d5667c 100644
--- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
@@ -82,4 +82,10 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="sv">Ersta Sköndal Högskola</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.esh.se/</OrganizationURL>
+  </Organization>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
index 359287e1..8f24258b 100644
--- a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -78,8 +78,8 @@ o04ltBnMhQ==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
   </Organization>
   <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index 3f388b28..2f39bf01 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -78,7 +78,8 @@ g3K9tR/NfPn3yNgy/kBRABuYJVjrtsbq/1PJ6Kg807taKYrz+vyERbn0
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">UniversitetsOchHogskoleradet</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Universitets- och högskolerådet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet (UHR)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education (UHR)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">