1 files changed, 24 insertions, 33 deletions
diff --git a/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml b/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
index ee651370..4303a0b3 100644
--- a/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.oecd-ilibrary.org/shibboleth">
-  <!--
-		This is a "OECD iLibrary" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.oecd-ilibrary.org/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-02T13:56:58Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -36,28 +33,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.oecd-ilibrary.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">OECD iLibrary</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://test.oecd-ilibrary.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Babu</GivenName>
-    <SurName>Panneerselvam</SurName>
-    <EmailAddress>mailto:babu.panneerselvam@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.oecd-ilibrary.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OECD iLibrary</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://test.oecd-ilibrary.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:Talvinder.matharu@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>