SWAMID-677: Metadata updated for Ladok sites

9 files changed, 160 insertions, 114 deletions

diff --git a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml b/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
index d78e3e8a..fe5eefb0 100644
--- a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
+++ b/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://integratorsportal.ladok.se/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-20T13:24:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -20,6 +21,9 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-20T13:24:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
@@ -33,76 +37,86 @@
       <mdui:UIInfo>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Ladok integrator's portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok integratörsportal</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:Logo xml:lang="en" height="98" width="96">https://www.start.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="98" width="96">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">Ladok integrator's portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Ladok integratörsportal</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>integratorportal.utv.ladok.se</ds:KeyName>
+        <ds:KeyName>integratorsportal.ladok.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=integratorportal.utv.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUDYi+9C4vCFEpX1JMG+r1H1BL7OcwDQYJKoZIhvcNAQEL
-BQAwKDEmMCQGA1UEAxMdaW50ZWdyYXRvcnBvcnRhbC51dHYubGFkb2suc2UwHhcN
-MjEwOTE0MDkxMjAzWhcNMzEwOTEyMDkxMjAzWjAoMSYwJAYDVQQDEx1pbnRlZ3Jh
-dG9ycG9ydGFsLnV0di5sYWRvay5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC
-AYoCggGBAMuvhOb3BxskvdbLZl0k+Q9KY71rBU6eecn1RZoMxBtXk96kk3I+7JFN
-ErpOyWig61uy9nXQu6EmC1v3CWkzUB3Ipr9UvqjzrmixxZ1cqPeBp2PS29KgDIJR
-dD7IH5nnNxodGmkk1BBuoQqVU2YG5PmiMPrFAtVywvb4i9nbZ4tXOI9mQ+/U2xJz
-aJe2f90VDjrcPjLfugvjx2WBLmiWVANuHTWWfd9nvL16ZY5+JX5M+dbE+EJQzQ1W
-3Slnd9pCSuJe2Pqugli9YX+l+qDonAkM90cbOVzQ17Ss4jcnkcGlVrvV7lrCVCQh
-3NxA9zEysK6ai3f/VVI8wHB1Rq8hro6uI5caDxjN5fHa4F20r2D25PfBdvFTlORr
-2XA6SpxCVIrb6+7gnOTDMjF1Sa1L2tweWi3o3XCdk4cftSOZcjtC5C6/EBxy1/9z
-iLapAlGfcg8UQNyrN6xwbCL8BOeKhxO5B/vEfiTNk/ASGCswDHFCzOyHliX4omoT
-p8+m3A3AnQIDAQABo0swSTAoBgNVHREEITAfgh1pbnRlZ3JhdG9ycG9ydGFsLnV0
-di5sYWRvay5zZTAdBgNVHQ4EFgQUzAShK9nmkW5fm3v1hlk58et1d/4wDQYJKoZI
-hvcNAQELBQADggGBADmttIfO9KlQd9ZH6jQ13KMnc5t/QenPiiSKzX2h+ipMlMNO
-k7mm874RzcB1fEa9B2EJ1NK8BzfdszQxBm5EKtIM3P3h/kdri+p+d/u30hUaF+ST
-jhPOvUHQYLLyCD3TqBD7llUlFopsIJ4Xoj3yzIyWDrFLDxGHdbE/vrpg5f8B81KN
-riACfmIK9S6h7bt6+FCxTMHzJ0GZMLCiNh658NzNutNvckjmt3BOTiatQkvm/2Pg
-WgItxanMkjkZuvsL47c2ZXNFGUWcW20BXuoERPzCX0bnxfQG0xe76nVjS6hWuL63
-BJA7e4OG+6IftGwnbts3dWjvW/3RRXVBk5MUIyQ6cbwtU7bjGMDCCTxb0opl64kn
-tVLSku307WjhTw/v/CCU5eJIlvHczThyZcahj6ZMDE5mnCka3l+Ji6xK7tq3U2ra
-bfbajbzCKZHuDqQ8/ma4SJ7IIFBJCosG1mxsWT7tUmyXc4NhOPhpNQg1ZkpiOzi2
-imI7fKJp6ilQ9FahRA==
+          <ds:X509SubjectName>CN=integratorsportal.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFKzCCAxOgAwIBAgIUX9lO+QpNaqJv8al+y4m1EDKdqDwwDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAwwaaW50ZWdyYXRvcnNwb3J0YWwubGFkb2suc2UwHhcNMjIw
+MjAyMTMxMzQwWhcNMzIwMTMxMTMxMzQwWjAlMSMwIQYDVQQDDBppbnRlZ3JhdG9y
+c3BvcnRhbC5sYWRvay5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AMqp/0cdDxGIQBPSyBcGoQOeu7Q1z8+t6llAh7pMDbAnYKG/jKdUWQe5W5KjiO44
+u7ltCfMnvs0+8N/l6bcVT06mVQ3Xh5IB3iUvFe4SIw5PuAIYCvIlOI6kT5VUOSD7
+SnLsCP1g3sdj/f4PV2Kbn1twJq66VXHYkkmq2rFrWx9lu7Vv7FhKaj1g0ZtXmDlW
+KG+KFEBtPXT4nchxybBzOT43iGJ+GZ6uKUSuZ0ox4WReRI+Mp5/yGuZAs4KXOPaR
+A4FsIwzU2julFNO3abzufR/zknvw19TbR21DhcAz8ok7NEPg9U7bYDDf1T4KOQFg
+88YeGF6RE/K4HtQBujJT2ESLZ4qB0xr88GuPGcGE4AVsv7MJQh+BH6JaWdsyOYjG
+7qZipOIHBvtpV6zp2zcvm5oPxc7yJ24FKRM2USK9Khtabaa706dmvhBatSj7ZWe5
+0tWxfxrkU0EwzVuVXk4cFXaCAxKGu/FVtAvg9anBZ5E7hG4InpVq/UEcgkpNZ5q8
+GlyFJkEO8EUxu5yYFaDuBPoaIy4RPlUxuqKasK7VU56bk0QO3eTPe21t7jydnLlY
+Jhb8dgDq9qcuvvuRFupPuEFy1YiQnG9q30CsQaeb8jPLUJCTmlqVsIR7ZfoG+VNs
+NgO2X8rHsgNPgJAJCKdhwnOjMHTq5oh/tDqARqn6eAxPAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRP8J6YdF1gJDH0OBz+9ICwjOgcvDAfBgNVHSMEGDAWgBRP8J6YdF1gJDH0
+OBz+9ICwjOgcvDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBv
+nXSM1CIQZBJ5S6PTtubyswo6z5yOAC7tS4/oaYMG/QVGnXJYdWd2j05mJS/yjz4Q
+kfhBnbao1yVXnydsx4QmAJFGiMIMF9QHeVV5XMz8HRvAkjjlinK/QufGuubCOM1R
+EJ8VPyUZp5wc4tTlZ0i6NFyeG1xyh6MlkXp+g+0clvAkqYj580lDhNDNNqSSXUIn
+BdeJaNbapHw6bgFtd6U7Hev6SDrLMD6X+PAdJIUa3EgKMPrfa8eLMomS/+GbhFcf
+i8LFkdWhRrz/tHuFPzxc6lV8IR8AxnFeqZSdQqBH67+AAXEHXFo7LEbq2hmzNDbn
+homnL2deJN8H9rrS0EA+imrV7Kz1aIUvRvGBG2dwJLDWfKHyNO1iA0FdKNSmCeL/
+TPB9Xi/bzhzISuuRKyK4xEwVMkT5T2foFqijOE7Wrxwd7SSfRSs21fsCs+qObnmA
+Gq2nMPTPfrZVLpsthNTYFb/zov52jUBzDmwplF1XSgPW+Hbalpzx4M38tv+hVHKu
+1WFOupxX2OnAcMTGY969zWLuTDOiKnBwRgN/eB6Fs4N8+eexoa5Tt+uOFHZKiGYs
+WvoQkMOy4Z4m/Rixo/EqjjEq3Bw+nvbEriVKLEpUpg15kTrplFnh7AlIdSsG7jOQ
+iCM4uXJsB1tlaP1rFw37vxKLuwMUGyiPU9Wour5gWA==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>integratorportal.utv.ladok.se</ds:KeyName>
+        <ds:KeyName>integratorsportal.ladok.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=integratorportal.utv.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUDYi+9C4vCFEpX1JMG+r1H1BL7OcwDQYJKoZIhvcNAQEL
-BQAwKDEmMCQGA1UEAxMdaW50ZWdyYXRvcnBvcnRhbC51dHYubGFkb2suc2UwHhcN
-MjEwOTE0MDkxMjAzWhcNMzEwOTEyMDkxMjAzWjAoMSYwJAYDVQQDEx1pbnRlZ3Jh
-dG9ycG9ydGFsLnV0di5sYWRvay5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC
-AYoCggGBAMuvhOb3BxskvdbLZl0k+Q9KY71rBU6eecn1RZoMxBtXk96kk3I+7JFN
-ErpOyWig61uy9nXQu6EmC1v3CWkzUB3Ipr9UvqjzrmixxZ1cqPeBp2PS29KgDIJR
-dD7IH5nnNxodGmkk1BBuoQqVU2YG5PmiMPrFAtVywvb4i9nbZ4tXOI9mQ+/U2xJz
-aJe2f90VDjrcPjLfugvjx2WBLmiWVANuHTWWfd9nvL16ZY5+JX5M+dbE+EJQzQ1W
-3Slnd9pCSuJe2Pqugli9YX+l+qDonAkM90cbOVzQ17Ss4jcnkcGlVrvV7lrCVCQh
-3NxA9zEysK6ai3f/VVI8wHB1Rq8hro6uI5caDxjN5fHa4F20r2D25PfBdvFTlORr
-2XA6SpxCVIrb6+7gnOTDMjF1Sa1L2tweWi3o3XCdk4cftSOZcjtC5C6/EBxy1/9z
-iLapAlGfcg8UQNyrN6xwbCL8BOeKhxO5B/vEfiTNk/ASGCswDHFCzOyHliX4omoT
-p8+m3A3AnQIDAQABo0swSTAoBgNVHREEITAfgh1pbnRlZ3JhdG9ycG9ydGFsLnV0
-di5sYWRvay5zZTAdBgNVHQ4EFgQUzAShK9nmkW5fm3v1hlk58et1d/4wDQYJKoZI
-hvcNAQELBQADggGBADmttIfO9KlQd9ZH6jQ13KMnc5t/QenPiiSKzX2h+ipMlMNO
-k7mm874RzcB1fEa9B2EJ1NK8BzfdszQxBm5EKtIM3P3h/kdri+p+d/u30hUaF+ST
-jhPOvUHQYLLyCD3TqBD7llUlFopsIJ4Xoj3yzIyWDrFLDxGHdbE/vrpg5f8B81KN
-riACfmIK9S6h7bt6+FCxTMHzJ0GZMLCiNh658NzNutNvckjmt3BOTiatQkvm/2Pg
-WgItxanMkjkZuvsL47c2ZXNFGUWcW20BXuoERPzCX0bnxfQG0xe76nVjS6hWuL63
-BJA7e4OG+6IftGwnbts3dWjvW/3RRXVBk5MUIyQ6cbwtU7bjGMDCCTxb0opl64kn
-tVLSku307WjhTw/v/CCU5eJIlvHczThyZcahj6ZMDE5mnCka3l+Ji6xK7tq3U2ra
-bfbajbzCKZHuDqQ8/ma4SJ7IIFBJCosG1mxsWT7tUmyXc4NhOPhpNQg1ZkpiOzi2
-imI7fKJp6ilQ9FahRA==
+          <ds:X509SubjectName>CN=integratorsportal.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFKzCCAxOgAwIBAgIUX9lO+QpNaqJv8al+y4m1EDKdqDwwDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAwwaaW50ZWdyYXRvcnNwb3J0YWwubGFkb2suc2UwHhcNMjIw
+MjAyMTMxMzQwWhcNMzIwMTMxMTMxMzQwWjAlMSMwIQYDVQQDDBppbnRlZ3JhdG9y
+c3BvcnRhbC5sYWRvay5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AMqp/0cdDxGIQBPSyBcGoQOeu7Q1z8+t6llAh7pMDbAnYKG/jKdUWQe5W5KjiO44
+u7ltCfMnvs0+8N/l6bcVT06mVQ3Xh5IB3iUvFe4SIw5PuAIYCvIlOI6kT5VUOSD7
+SnLsCP1g3sdj/f4PV2Kbn1twJq66VXHYkkmq2rFrWx9lu7Vv7FhKaj1g0ZtXmDlW
+KG+KFEBtPXT4nchxybBzOT43iGJ+GZ6uKUSuZ0ox4WReRI+Mp5/yGuZAs4KXOPaR
+A4FsIwzU2julFNO3abzufR/zknvw19TbR21DhcAz8ok7NEPg9U7bYDDf1T4KOQFg
+88YeGF6RE/K4HtQBujJT2ESLZ4qB0xr88GuPGcGE4AVsv7MJQh+BH6JaWdsyOYjG
+7qZipOIHBvtpV6zp2zcvm5oPxc7yJ24FKRM2USK9Khtabaa706dmvhBatSj7ZWe5
+0tWxfxrkU0EwzVuVXk4cFXaCAxKGu/FVtAvg9anBZ5E7hG4InpVq/UEcgkpNZ5q8
+GlyFJkEO8EUxu5yYFaDuBPoaIy4RPlUxuqKasK7VU56bk0QO3eTPe21t7jydnLlY
+Jhb8dgDq9qcuvvuRFupPuEFy1YiQnG9q30CsQaeb8jPLUJCTmlqVsIR7ZfoG+VNs
+NgO2X8rHsgNPgJAJCKdhwnOjMHTq5oh/tDqARqn6eAxPAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRP8J6YdF1gJDH0OBz+9ICwjOgcvDAfBgNVHSMEGDAWgBRP8J6YdF1gJDH0
+OBz+9ICwjOgcvDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBv
+nXSM1CIQZBJ5S6PTtubyswo6z5yOAC7tS4/oaYMG/QVGnXJYdWd2j05mJS/yjz4Q
+kfhBnbao1yVXnydsx4QmAJFGiMIMF9QHeVV5XMz8HRvAkjjlinK/QufGuubCOM1R
+EJ8VPyUZp5wc4tTlZ0i6NFyeG1xyh6MlkXp+g+0clvAkqYj580lDhNDNNqSSXUIn
+BdeJaNbapHw6bgFtd6U7Hev6SDrLMD6X+PAdJIUa3EgKMPrfa8eLMomS/+GbhFcf
+i8LFkdWhRrz/tHuFPzxc6lV8IR8AxnFeqZSdQqBH67+AAXEHXFo7LEbq2hmzNDbn
+homnL2deJN8H9rrS0EA+imrV7Kz1aIUvRvGBG2dwJLDWfKHyNO1iA0FdKNSmCeL/
+TPB9Xi/bzhzISuuRKyK4xEwVMkT5T2foFqijOE7Wrxwd7SSfRSs21fsCs+qObnmA
+Gq2nMPTPfrZVLpsthNTYFb/zov52jUBzDmwplF1XSgPW+Hbalpzx4M38tv+hVHKu
+1WFOupxX2OnAcMTGY969zWLuTDOiKnBwRgN/eB6Fs4N8+eexoa5Tt+uOFHZKiGYs
+WvoQkMOy4Z4m/Rixo/EqjjEq3Bw+nvbEriVKLEpUpg15kTrplFnh7AlIdSsG7jOQ
+iCM4uXJsB1tlaP1rFw37vxKLuwMUGyiPU9Wour5gWA==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -131,17 +145,17 @@ imI7fKJp6ilQ9FahRA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://integratorsportal.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://integratorsportal.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Ladok integratörsportal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok integrator's portal</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok integratörsportal</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
@@ -149,25 +163,25 @@ imI7fKJp6ilQ9FahRA==
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
index 173a60a7..215ae12f 100644
--- a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.integrationstest.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-10T13:58:57Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:02Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -85,31 +86,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/student.test.ladok.se-student-sp.xml b/swamid-2.0/student.test.ladok.se-student-sp.xml
index 75892bcb..7998d5e5 100644
--- a/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.test.ladok.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.test.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-23T10:34:25Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:02Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -85,31 +86,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index 56a8dacf..01cd55da 100644
--- a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.utbildning.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-20T16:31:43Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:03Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -85,31 +86,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
index a38f3bfe..5bfb8a0e 100644
--- a/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.integrationstest.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-10T13:58:57Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:04Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -86,31 +87,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/www.start.ladok.se-gui-sp.xml b/swamid-2.0/www.start.ladok.se-gui-sp.xml
index 2e650300..0d836bbe 100644
--- a/swamid-2.0/www.start.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.start.ladok.se-gui-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.start.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:04Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -31,8 +31,6 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.start.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.start.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok för personal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok for employees</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
         <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
@@ -41,6 +39,8 @@
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">Ladok for employees</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok för personal</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -86,31 +87,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/swamid-2.0/www.student.ladok.se-student-sp.xml
index 75fbff2d..ed4e68f7 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.student.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:05Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -31,8 +31,6 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.student.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.student.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok för studenter</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok for students</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
         <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
@@ -41,6 +39,8 @@
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">Ladok for students</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok för studenter</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -85,31 +86,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/www.test.ladok.se-gui-sp.xml b/swamid-2.0/www.test.ladok.se-gui-sp.xml
index 12826e12..0f54e3e1 100644
--- a/swamid-2.0/www.test.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.test.ladok.se-gui-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.test.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-17T16:34:15Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:06Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -86,31 +87,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml b/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
index 15faafd7..ee8a0ec4 100644
--- a/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.utbildning.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-20T16:31:43Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:06Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -86,31 +87,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>