13 files changed, 11 insertions, 11 deletions
diff --git a/fiv/aprikos.pingpong.net.xml b/fiv/aprikos.pingpong.net-shibboleth.xml
index b0aa9b49..b0aa9b49 100644
--- a/fiv/aprikos.pingpong.net.xml
+++ b/fiv/aprikos.pingpong.net-shibboleth.xml
diff --git a/fiv/aprikoslogin.pingpong.net.xml b/fiv/aprikoslogin.pingpong.net-simplesaml-saml2-idp-metadata.php.xml
index 6230d3b9..6230d3b9 100644
--- a/fiv/aprikoslogin.pingpong.net.xml
+++ b/fiv/aprikoslogin.pingpong.net-simplesaml-saml2-idp-metadata.php.xml
diff --git a/fiv/idp-test.pingpong.net.xml b/fiv/idp-test.pingpong.net-simplesaml-saml2-idp-metadata.php.xml
index 62494766..62494766 100644
--- a/fiv/idp-test.pingpong.net.xml
+++ b/fiv/idp-test.pingpong.net-simplesaml-saml2-idp-metadata.php.xml
diff --git a/fiv/login-test-hjt.pingpong.net.xml b/fiv/login-test-hjt.pingpong.net-simplesaml-saml2-idp-metadata.php.xml
index ec41f70b..ec41f70b 100644
--- a/fiv/login-test-hjt.pingpong.net.xml
+++ b/fiv/login-test-hjt.pingpong.net-simplesaml-saml2-idp-metadata.php.xml
diff --git a/fiv/login.hjarntorget.net.xml b/fiv/login.hjarntorget.net-simplesaml-saml2-idp-metadata.php.xml
index de06d622..de06d622 100644
--- a/fiv/login.hjarntorget.net.xml
+++ b/fiv/login.hjarntorget.net-simplesaml-saml2-idp-metadata.php.xml
diff --git a/fiv/paron.pingpong.net.xml b/fiv/paron.pingpong.net-shibboleth.xml
index cc835f76..cc835f76 100644
--- a/fiv/paron.pingpong.net.xml
+++ b/fiv/paron.pingpong.net-shibboleth.xml
diff --git a/fiv/pingpongtest-vir-1.test.it.gu.se.xml b/fiv/pingpongtest-vir-1.test.it.gu.se-shibboleth.xml
index 8f8e14c3..8f8e14c3 100644
--- a/fiv/pingpongtest-vir-1.test.it.gu.se.xml
+++ b/fiv/pingpongtest-vir-1.test.it.gu.se-shibboleth.xml
diff --git a/swamid-fiv-test.mxml b/swamid-fiv-test.mxml
index 8b374e41..54e200f3 100644
--- a/swamid-fiv-test.mxml
+++ b/swamid-fiv-test.mxml
@@ -3,11 +3,11 @@
    <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
    <xi:include href="swamid-1.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-1.0/flax.nettst.chalmers.se-adfs-services-trust.xml"/>
-   <xi:include href="fiv/aprikos.pingpong.net.xml"/>
-   <xi:include href="fiv/aprikoslogin.pingpong.net.xml"/>
-   <xi:include href="fiv/paron.pingpong.net.xml"/>
-   <xi:include href="fiv/pingpongtest-vir-1.test.it.gu.se.xml"/>
-   <xi:include href="fiv/idp-test.pingpong.net.xml"/>
-   <xi:include href="fiv/login-test-hjt.pingpong.net.xml"/>
-   <xi:include href="fiv/login.hjarntorget.net.xml"/>
+   <xi:include href="fiv/aprikos.pingpong.net-shibboleth.xml"/>
+   <xi:include href="fiv/aprikoslogin.pingpong.net-simplesaml-saml2-idp-metadata.php.xml"/>
+   <xi:include href="fiv/paron.pingpong.net-shibboleth.xml"/>
+   <xi:include href="fiv/pingpongtest-vir-1.test.it.gu.se-shibboleth.xml"/>
+   <xi:include href="fiv/idp-test.pingpong.net-simplesaml-saml2-idp-metadata.php.xml"/>
+   <xi:include href="fiv/login-test-hjt.pingpong.net-simplesaml-saml2-idp-metadata.php.xml"/>
+   <xi:include href="fiv/login.hjarntorget.net-simplesaml-saml2-idp-metadata.php.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml
index 49ffbff0..37258626 100644
--- a/swamid-ki-sll-1.0.mxml
+++ b/swamid-ki-sll-1.0.mxml
@@ -3,9 +3,9 @@
   <xi:include href="swamid-1.0/kiidp.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-1.0/samadhi.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/necs.sll.se.xml"/>
-  <xi:include href="swamid-ki-sll-1.0/idp.sll.se.xml"/>
+  <xi:include href="swamid-ki-sll-1.0/idp.sll.se-neas.xml"/>
   <xi:include href="swamid-1.0/bibliometrics.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-ki-sll-1.0/beta.kib.ki.se.xml"/>
-  <xi:include href="swamid-ki-sll-1.0/pubtest.kib.ki.se.xml"/>
-  <xi:include href="swamid-ki-sll-1.0/idpext.test.ek.sll.se.xml"/>
+  <xi:include href="swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-ki-sll-1.0/idpext.test.ek.sll.se-neas.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-ki-sll-1.0/beta.kib.ki.se.xml b/swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml
index cd7c28fb..cd7c28fb 100644
--- a/swamid-ki-sll-1.0/beta.kib.ki.se.xml
+++ b/swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml
diff --git a/swamid-ki-sll-1.0/idp.sll.se.xml b/swamid-ki-sll-1.0/idp.sll.se-neas.xml
index 28ccc0e5..28ccc0e5 100644
--- a/swamid-ki-sll-1.0/idp.sll.se.xml
+++ b/swamid-ki-sll-1.0/idp.sll.se-neas.xml
diff --git a/swamid-ki-sll-1.0/idpext.test.ek.sll.se.xml b/swamid-ki-sll-1.0/idpext.test.ek.sll.se-neas.xml
index c530a67e..c530a67e 100644
--- a/swamid-ki-sll-1.0/idpext.test.ek.sll.se.xml
+++ b/swamid-ki-sll-1.0/idpext.test.ek.sll.se-neas.xml
diff --git a/swamid-ki-sll-1.0/pubtest.kib.ki.se.xml b/swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml
index 33d80321..33d80321 100644
--- a/swamid-ki-sll-1.0/pubtest.kib.ki.se.xml
+++ b/swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml