1 files changed, 78 insertions, 21 deletions
diff --git a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
index a4395843..db0a6b0c 100644
--- a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kpi.ua/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2014-12-27T16:24:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="ua">http://peano.uran.ua/~ukr/policy.htm</mdrpi:RegistrationPolicy>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-05-12T11:00:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
@@ -12,40 +10,99 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">NTUU KPI IdP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ru">НТУУ КПИ IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ua">НТУУ КПІ IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="uk">НТУУ КПІ IdP</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for NTUU "KPI"</mdui:Description>
         <mdui:Description xml:lang="ru">Identity Provider для НТУУ "КПИ"</mdui:Description>
-        <mdui:Description xml:lang="ua">Identity Provider для НТУУ "КПІ"</mdui:Description>
+        <mdui:Description xml:lang="uk">Identity Provider для НТУУ "КПІ"</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://idp.kpi.ua</mdui:InformationURL>
         <mdui:InformationURL xml:lang="ru">https://idp.kpi.ua</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="ua">https://idp.kpi.ua</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="uk">https://idp.kpi.ua</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="ua">http://peano.uran.ua/~ukr/policy.htm</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="en">NTUU+KPI IdP SAML</mdui:Keywords>
-        <mdui:Keywords xml:lang="ru">НТУУ+КПИ IdP SAML</mdui:Keywords>
-        <mdui:Keywords xml:lang="ua">НТУУ+КПІ IdP SAML</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="uk">http://peano.uran.ua/~ukr/policy.htm</mdui:PrivacyStatementURL>
         <mdui:Logo height="219" width="181">https://idp.kpi.ua/kpi-logo.jpg</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:50.450233,30.461022</mdui:GeolocationHint>
         <mdui:IPHint>77.47.128.0/17</mdui:IPHint>
         <mdui:IPHint>2a02:db0::/32</mdui:IPHint>
         <mdui:DomainHint>kpi.ua</mdui:DomainHint>
         <mdui:DomainHint>ntu-kpi.kiev.ua</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.450233,30.461022</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIFkDCCBHigAwIBAgIRAJIIAUt70bEEHD01hp+3oA0wDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMjA3MDAwMDAwWhcNMTYwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUIwQAYDVQQLEzlQcm92aWRlZCBieSBDZW50ZXIgb2YgVWtyYWluaWFuIEludGVybmV0IE5hbWVzIChVS1JOQU1FUykxHDAaBgNVBAsTE1Vrcm5hbWVzIERvbWFpbiBTU0wxEzARBgNVBAMTCmlkcC5rcGkudWEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjShrR7ty5GFP8THkTY4JDq/N0cp+LLkjK0YQeSVdEDA8DZG983QzfL4/18b6lrxI30OugG/AtnVZCMTwFTi+tytasbPdwSCCwR9L+rqkX6pdlE1qo54BLCNa/C9WuSP1fApb/GJiRBiXneXQ00HC4GU8xJmd+w2qYcJyrszupvc/aXDaPHRgygDYaSr4gohcUP1lxocDAInSHjdg7Zja+nCjWU/LveGF9wNVZsRhdpjRjcfpOpxl89B+itNm1F5YIM5KC9LwsSz1y3a6amYC3FWdCY5VPPa8upn1aFCrmEwgh1JMQAXHiOOHj1P0IvGJpSL1OYD82xedadrXVG5r3AgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAdBgNVHQ4EFgQU0UUinIqInadfn1BOUkL72VQMmKUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1UdIARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCCmlkcC5rcGkudWGCDnd3dy5pZHAua3BpLnVhMA0GCSqGSIb3DQEBCwUAA4IBAQBafwV+hrt59i7824IK9/EgZW6hQFTy7epEx/omk3KS9IkLFfu6FPw+KujKcsbQtFw6X1neIqmTuweC57OYBuRgQBIooMYCTJaaXYfo5Y4kK1GCCigjbL5EJCaAYxk10zcBfNkd/WmmDIpTNuam5Nw8/CYGd6AiCtnJZZpC3C1/JMQ5UDY3BcIDOsaoAMhR3AmHoFe9KNeFbfQ3lRRwZPdgik2AzT3XJh4VKBVXXJ1xgCKRNpyhKYfo4dXW0CjoVHA4jY61SXFqeWjFPZB/bJpx4mCxRAFV+xqJT4Bhy84K+R9gO0rTEcQb77Jd8p6yDG0DoKY6D/K0WywT/ePcsOig</ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFkDCCBHigAwIBAgIRAJIIAUt70bEEHD01hp+3oA0wDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTQxMjA3MDAwMDAwWhcNMTYwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUIwQAYDVQQLEzlQcm92aWRlZCBieSBD
+ZW50ZXIgb2YgVWtyYWluaWFuIEludGVybmV0IE5hbWVzIChVS1JOQU1FUykxHDAa
+BgNVBAsTE1Vrcm5hbWVzIERvbWFpbiBTU0wxEzARBgNVBAMTCmlkcC5rcGkudWEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjShrR7ty5GFP8THkTY4JD
+q/N0cp+LLkjK0YQeSVdEDA8DZG983QzfL4/18b6lrxI30OugG/AtnVZCMTwFTi+t
+ytasbPdwSCCwR9L+rqkX6pdlE1qo54BLCNa/C9WuSP1fApb/GJiRBiXneXQ00HC4
+GU8xJmd+w2qYcJyrszupvc/aXDaPHRgygDYaSr4gohcUP1lxocDAInSHjdg7Zja+
+nCjWU/LveGF9wNVZsRhdpjRjcfpOpxl89B+itNm1F5YIM5KC9LwsSz1y3a6amYC3
+FWdCY5VPPa8upn1aFCrmEwgh1JMQAXHiOOHj1P0IvGJpSL1OYD82xedadrXVG5r3
+AgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAd
+BgNVHQ4EFgQU0UUinIqInadfn1BOUkL72VQMmKUwDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1Ud
+IARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1
+cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0
+dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
+ZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZD
+aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlv
+blNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29t
+b2RvY2EuY29tMCUGA1UdEQQeMByCCmlkcC5rcGkudWGCDnd3dy5pZHAua3BpLnVh
+MA0GCSqGSIb3DQEBCwUAA4IBAQBafwV+hrt59i7824IK9/EgZW6hQFTy7epEx/om
+k3KS9IkLFfu6FPw+KujKcsbQtFw6X1neIqmTuweC57OYBuRgQBIooMYCTJaaXYfo
+5Y4kK1GCCigjbL5EJCaAYxk10zcBfNkd/WmmDIpTNuam5Nw8/CYGd6AiCtnJZZpC
+3C1/JMQ5UDY3BcIDOsaoAMhR3AmHoFe9KNeFbfQ3lRRwZPdgik2AzT3XJh4VKBVX
+XJ1xgCKRNpyhKYfo4dXW0CjoVHA4jY61SXFqeWjFPZB/bJpx4mCxRAFV+xqJT4Bh
+y84K+R9gO0rTEcQb77Jd8p6yDG0DoKY6D/K0WywT/ePcsOig
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIFkDCCBHigAwIBAgIRAJIIAUt70bEEHD01hp+3oA0wDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMjA3MDAwMDAwWhcNMTYwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUIwQAYDVQQLEzlQcm92aWRlZCBieSBDZW50ZXIgb2YgVWtyYWluaWFuIEludGVybmV0IE5hbWVzIChVS1JOQU1FUykxHDAaBgNVBAsTE1Vrcm5hbWVzIERvbWFpbiBTU0wxEzARBgNVBAMTCmlkcC5rcGkudWEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjShrR7ty5GFP8THkTY4JDq/N0cp+LLkjK0YQeSVdEDA8DZG983QzfL4/18b6lrxI30OugG/AtnVZCMTwFTi+tytasbPdwSCCwR9L+rqkX6pdlE1qo54BLCNa/C9WuSP1fApb/GJiRBiXneXQ00HC4GU8xJmd+w2qYcJyrszupvc/aXDaPHRgygDYaSr4gohcUP1lxocDAInSHjdg7Zja+nCjWU/LveGF9wNVZsRhdpjRjcfpOpxl89B+itNm1F5YIM5KC9LwsSz1y3a6amYC3FWdCY5VPPa8upn1aFCrmEwgh1JMQAXHiOOHj1P0IvGJpSL1OYD82xedadrXVG5r3AgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAdBgNVHQ4EFgQU0UUinIqInadfn1BOUkL72VQMmKUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1UdIARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCCmlkcC5rcGkudWGCDnd3dy5pZHAua3BpLnVhMA0GCSqGSIb3DQEBCwUAA4IBAQBafwV+hrt59i7824IK9/EgZW6hQFTy7epEx/omk3KS9IkLFfu6FPw+KujKcsbQtFw6X1neIqmTuweC57OYBuRgQBIooMYCTJaaXYfo5Y4kK1GCCigjbL5EJCaAYxk10zcBfNkd/WmmDIpTNuam5Nw8/CYGd6AiCtnJZZpC3C1/JMQ5UDY3BcIDOsaoAMhR3AmHoFe9KNeFbfQ3lRRwZPdgik2AzT3XJh4VKBVXXJ1xgCKRNpyhKYfo4dXW0CjoVHA4jY61SXFqeWjFPZB/bJpx4mCxRAFV+xqJT4Bhy84K+R9gO0rTEcQb77Jd8p6yDG0DoKY6D/K0WywT/ePcsOig</ds:X509Certificate>
+          <ds:X509Certificate>
+MIIFkDCCBHigAwIBAgIRAJIIAUt70bEEHD01hp+3oA0wDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTQxMjA3MDAwMDAwWhcNMTYwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUIwQAYDVQQLEzlQcm92aWRlZCBieSBD
+ZW50ZXIgb2YgVWtyYWluaWFuIEludGVybmV0IE5hbWVzIChVS1JOQU1FUykxHDAa
+BgNVBAsTE1Vrcm5hbWVzIERvbWFpbiBTU0wxEzARBgNVBAMTCmlkcC5rcGkudWEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjShrR7ty5GFP8THkTY4JD
+q/N0cp+LLkjK0YQeSVdEDA8DZG983QzfL4/18b6lrxI30OugG/AtnVZCMTwFTi+t
+ytasbPdwSCCwR9L+rqkX6pdlE1qo54BLCNa/C9WuSP1fApb/GJiRBiXneXQ00HC4
+GU8xJmd+w2qYcJyrszupvc/aXDaPHRgygDYaSr4gohcUP1lxocDAInSHjdg7Zja+
+nCjWU/LveGF9wNVZsRhdpjRjcfpOpxl89B+itNm1F5YIM5KC9LwsSz1y3a6amYC3
+FWdCY5VPPa8upn1aFCrmEwgh1JMQAXHiOOHj1P0IvGJpSL1OYD82xedadrXVG5r3
+AgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAd
+BgNVHQ4EFgQU0UUinIqInadfn1BOUkL72VQMmKUwDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1Ud
+IARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1
+cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0
+dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
+ZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZD
+aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlv
+blNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29t
+b2RvY2EuY29tMCUGA1UdEQQeMByCCmlkcC5rcGkudWGCDnd3dy5pZHAua3BpLnVh
+MA0GCSqGSIb3DQEBCwUAA4IBAQBafwV+hrt59i7824IK9/EgZW6hQFTy7epEx/om
+k3KS9IkLFfu6FPw+KujKcsbQtFw6X1neIqmTuweC57OYBuRgQBIooMYCTJaaXYfo
+5Y4kK1GCCigjbL5EJCaAYxk10zcBfNkd/WmmDIpTNuam5Nw8/CYGd6AiCtnJZZpC
+3C1/JMQ5UDY3BcIDOsaoAMhR3AmHoFe9KNeFbfQ3lRRwZPdgik2AzT3XJh4VKBVX
+XJ1xgCKRNpyhKYfo4dXW0CjoVHA4jY61SXFqeWjFPZB/bJpx4mCxRAFV+xqJT4Bh
+y84K+R9gO0rTEcQb77Jd8p6yDG0DoKY6D/K0WywT/ePcsOig
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -54,18 +111,18 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kpi.ua/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
     <md:OrganizationName xml:lang="ru">Национальный Технический Университет Украины "Киевский политехнический институт"</md:OrganizationName>
-    <md:OrganizationName xml:lang="ua">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="uk">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="ru">НТУУ "КПИ"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ua">НТУУ "КПІ"</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="uk">НТУУ "КПІ"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="ru">http://kpi.ua/ru</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="ua">http://kpi.ua</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="uk">http://kpi.ua</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>TechSupport</md:SurName>
-    <md:EmailAddress>support@kpi.ua</md:EmailAddress>
+    <md:EmailAddress>mailto:support@kpi.ua</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>