Renamed files to match entityID

27 files changed, 28 insertions, 49 deletions

diff --git a/scripts/rename-xml.sh b/scripts/rename-xml.sh
index 59a0f04b..4326579f 100755
--- a/scripts/rename-xml.sh
+++ b/scripts/rename-xml.sh
@@ -9,29 +9,15 @@ error()
 	exit 1
 }
 
-entityID=$1
-if [ -z "$entityID" ] ; then
+metadata=$1
+if [ -z "$metadata" ] ; then
 	cat <<EOF
-Usage: `basename $0` <entityID>
-Ex:    `basename $0` https://shibsp.mysite.com/swamidproxy/gitlab.xml
+Usage: `basename $0` <file to check>
+Ex:    `basename $0` account.eciu.eu.xml
 EOF
 	exit 1
 fi
 
-script_cwd=`dirname "$0"`
-if test -d swamid-2.0 ; then
-	echo "Moving into swamid-2.0/"
-	cd swamid-2.0
-	echo "$script_cwd" | grep -q ^/ || script_cwd=../$script_cwd
-fi
-
-if echo "$entityID" | grep -qE '^http://|^https://' ; then
-	metadata=`grep -il "entityID.*$entityID" *`
-else
-	echo "Missing http(s) in entityID"
-fi
-[ -n "$metadata" ] || error "Failed to fetch metadata from $metadataurl"
-
 entityid=`cat "$metadata" | sed -n 's/.*entityID=['\''"]\([^"]*\)['\''"].*/\1/p'`
 [ -n "$entityid" ] || error "Failed to find entityID in metadata"
 [ `echo "$entityid" | wc -l` = 1 ] || error "Multiple entityid:s found: `echo $entityid`"
@@ -49,13 +35,6 @@ fi
 read x
 case $x in
 	Y|y|"")
-		grep -l "$metadata\"" ../*.mxml | while read file; do
-			sed -i.bak "s;href=\"swamid-2.0/$metadata\";href=\"swamid-2.0/$entityidfn\";" $file
-			if [ -f ${file}.bak ]; then
-				rm ${file}.bak
-			fi
-
-		done
 		git mv $metadata $entityidfn
 
 		;;
diff --git a/swamid-2.0/account.lnu.se-saml2.xml b/swamid-2.0/account.lnu.se-Saml2.xml
index 5fc5fe20..5fc5fe20 100644
--- a/swamid-2.0/account.lnu.se-saml2.xml
+++ b/swamid-2.0/account.lnu.se-Saml2.xml
diff --git a/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml b/swamid-2.0/admin.akademiskahogtider.se-Shibboleth.sso.xml
index f1d7c336..f1d7c336 100644
--- a/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
+++ b/swamid-2.0/admin.akademiskahogtider.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/beta-nyasidorna.uhr.se-shibboleth.xml b/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
index b14ee4a9..b14ee4a9 100644
--- a/swamid-2.0/beta-nyasidorna.uhr.se-shibboleth.xml
+++ b/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/hrm.flexhosting.se-hrm-.xml b/swamid-2.0/hrm.flexhosting.se-HRM-.xml
index 17016edf..17016edf 100644
--- a/swamid-2.0/hrm.flexhosting.se-hrm-.xml
+++ b/swamid-2.0/hrm.flexhosting.se-HRM-.xml
diff --git a/swamid-2.0/id.easyvote.se-saml2-lucat.xml b/swamid-2.0/id.easyvote.se-Saml2-Lucat.xml
index 4edfcae6..4edfcae6 100644
--- a/swamid-2.0/id.easyvote.se-saml2-lucat.xml
+++ b/swamid-2.0/id.easyvote.se-Saml2-Lucat.xml
diff --git a/swamid-2.0/konto.gih.se-saml2.xml b/swamid-2.0/konto.gih.se-Saml2.xml
index 92141a1e..92141a1e 100644
--- a/swamid-2.0/konto.gih.se-saml2.xml
+++ b/swamid-2.0/konto.gih.se-Saml2.xml
diff --git a/swamid-2.0/login.ifmsa.se-spp.xml b/swamid-2.0/login.ifmsa.se-spp-.xml
index 32d1d71e..32d1d71e 100644
--- a/swamid-2.0/login.ifmsa.se-spp.xml
+++ b/swamid-2.0/login.ifmsa.se-spp-.xml
diff --git a/swamid-2.0/nfg.su.se-shibboleth.sso.xml b/swamid-2.0/nfg.su.se-Shibboleth.sso.xml
index f3262f6b..f3262f6b 100644
--- a/swamid-2.0/nfg.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/nfg.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml b/swamid-2.0/nyainloggning-test.hv.se-Shibboleth.xml
index 97c76aae..97c76aae 100644
--- a/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml
+++ b/swamid-2.0/nyainloggning-test.hv.se-Shibboleth.xml
diff --git a/swamid-2.0/nyainloggning.hv.se-shibboleth.xml b/swamid-2.0/nyainloggning.hv.se-Shibboleth.xml
index 6af3c806..6af3c806 100644
--- a/swamid-2.0/nyainloggning.hv.se-shibboleth.xml
+++ b/swamid-2.0/nyainloggning.hv.se-Shibboleth.xml
diff --git a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml b/swamid-2.0/pingpong.hb.se-Shibboleth.sso-Metadata.xml
index e722b7da..e722b7da 100644
--- a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/pingpong.hb.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/rb.lbic.lu.se.xml b/swamid-2.0/rb.lbic.lu.se-.xml
index 8812f39d..8812f39d 100644
--- a/swamid-2.0/rb.lbic.lu.se.xml
+++ b/swamid-2.0/rb.lbic.lu.se-.xml
diff --git a/swamid-2.0/service.projectplace.com-saml-metadata.xml b/swamid-2.0/service.projectplace.com-saml-metadata.xml.xml
index e92c5e99..e92c5e99 100644
--- a/swamid-2.0/service.projectplace.com-saml-metadata.xml
+++ b/swamid-2.0/service.projectplace.com-saml-metadata.xml.xml
diff --git a/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml b/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
index e29b6163..e29b6163 100644
--- a/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml
+++ b/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml
index fadbf772..fadbf772 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml
diff --git a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-dev.su.se-Shibboleth.sso.xml
index c28bb784..c28bb784 100644
--- a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-dev.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-dev2.su.se-Shibboleth.sso.xml
index 06f55902..06f55902 100644
--- a/swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-dev2.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfu-dev3.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-dev3.su.se-Shibboleth.sso.xml
index 41e52540..41e52540 100644
--- a/swamid-2.0/vfu-dev3.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-dev3.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd-dev.su.se-Shibboleth.sso.xml
index d2371072..d2371072 100644
--- a/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd-dev.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
index 647ce79c..647ce79c 100644
--- a/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd.su.se-Shibboleth.sso.xml
index 189240c3..189240c3 100644
--- a/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd.su.se-Shibboleth.sso.xml
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0d1bb3e4..2496d328 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -10,13 +10,13 @@
   <xi:include href="swamid-2.0/account-idac.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/account-utv.hh.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/account.hh.se-Shibboleth.xml"/>
-  <xi:include href="swamid-2.0/account.lnu.se-saml2.xml"/>
+  <xi:include href="swamid-2.0/account.lnu.se-Saml2.xml"/>
   <xi:include href="swamid-2.0/account.mdu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/account.tst.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/activate-test.du.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/activate.du.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.artologik.net-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/admin.akademiskahogtider.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/admin.selma7.its.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml"/>
@@ -45,8 +45,8 @@
   <xi:include href="swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/backweb.test.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta-kib.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/beta-nyasidorna.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/bifur.sai.kau.se.xml"/>
   <xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
   <xi:include href="swamid-2.0/bofur.sae.kau.se.xml"/>
@@ -145,11 +145,11 @@
   <xi:include href="swamid-2.0/his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hkrplay.hkr.se.xml"/>
   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/hrm.flexhosting.se-hrm-.xml"/>
+  <xi:include href="swamid-2.0/hrm.flexhosting.se-HRM-.xml"/>
   <xi:include href="swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/hvplay.hv.se.xml"/>
   <xi:include href="swamid-2.0/id-test.du.se-saml2.xml"/>
-  <xi:include href="swamid-2.0/id.easyvote.se-saml2-lucat.xml"/>
+  <xi:include href="swamid-2.0/id.easyvote.se-Saml2-Lucat.xml"/>
   <xi:include href="swamid-2.0/id.statenssc.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/idp-proxy-social.sunet.se-sp.xml"/>
@@ -188,7 +188,7 @@
   <xi:include href="swamid-2.0/klara.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/konto.bth.se-sp.xml"/>
-  <xi:include href="swamid-2.0/konto.gih.se-saml2.xml"/>
+  <xi:include href="swamid-2.0/konto.gih.se-Saml2.xml"/>
   <xi:include href="swamid-2.0/konto.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/konto.hig.se-443-idm.xml"/>
   <xi:include href="swamid-2.0/konto.his.se.xml"/>
@@ -217,7 +217,7 @@
   <xi:include href="swamid-2.0/lnu.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.epsectra.com-oidc-authenticate-ephome_broker.xml"/>
   <xi:include href="swamid-2.0/login.ezproxy.its.uu.se-login.xml"/>
-  <xi:include href="swamid-2.0/login.ifmsa.se-spp.xml"/>
+  <xi:include href="swamid-2.0/login.ifmsa.se-spp-.xml"/>
   <xi:include href="swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml"/>
   <xi:include href="swamid-2.0/login.quicksearch.se-AuthServices.xml"/>
   <xi:include href="swamid-2.0/login.sto3.safespring.com-shibboleth.xml"/>
@@ -270,7 +270,7 @@
   <xi:include href="swamid-2.0/mystery.cs.lth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nai.uu.se.xml"/>
   <xi:include href="swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml"/>
-  <xi:include href="swamid-2.0/nfg.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/nfg.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/noec.release-check.swamid.se-shibboleth.xml"/>
@@ -278,14 +278,14 @@
   <xi:include href="swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nyainloggning.hv.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nyainloggning-test.hv.se-Shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nyainloggning.hv.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml"/>
   <xi:include href="swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml"/>
   <xi:include href="swamid-2.0/permit-eu.caleaccess.com.xml"/>
   <xi:include href="swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml"/>
+  <xi:include href="swamid-2.0/pingpong.hb.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/play.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/play.fhs.se.xml"/>
   <xi:include href="swamid-2.0/play.gih.se.xml"/>
@@ -323,7 +323,7 @@
   <xi:include href="swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rals.saco-s.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rands.release-check.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/rb.lbic.lu.se.xml"/>
+  <xi:include href="swamid-2.0/rb.lbic.lu.se-.xml"/>
   <xi:include href="swamid-2.0/redcap.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/redcap.tst.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rehab.test.uu.se-TicketServer-.xml"/>
@@ -369,7 +369,7 @@
   <xi:include href="swamid-2.0/search.ub.uu.se-mng-login.xml"/>
   <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/selfservice.hb.se-Shibboleth.xml"/>
-  <xi:include href="swamid-2.0/service.projectplace.com-saml-metadata.xml"/>
+  <xi:include href="swamid-2.0/service.projectplace.com-saml-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/service4mobility.su.se-mobility_test.xml"/>
   <xi:include href="swamid-2.0/sesam.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sgw.africa-grid.org-shibboleth.xml"/>
@@ -387,7 +387,7 @@
   <xi:include href="swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml.xml"/>
   <xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml"/>
+  <xi:include href="swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/sp.tshhosting.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml"/>
@@ -411,9 +411,9 @@
   <xi:include href="swamid-2.0/sunet.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/supr.snic.se.xml"/>
+  <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml"/>
-  <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml"/>
   <xi:include href="swamid-2.0/tds.test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml"/>
@@ -458,14 +458,14 @@
   <xi:include href="swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/valda.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/verify.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfu-dev3.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfu-dev.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfu-dev2.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfu-dev3.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vfu.su.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/vfusyd.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfusyd-dev.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/vfusyd.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/vgrgu.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/video.su.se.xml"/>
   <xi:include href="swamid-2.0/visp-demo.humlab.umu.se.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 550c1a2d..dad37694 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -3,8 +3,8 @@
   <xi:include href="swamid-testing/akka-adm.test.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-testing/aqtest.port.se-shibboleth.xml"/>
   <xi:include href="swamid-testing/castest.weblogin.uu.se-cas.xml"/>
-  <xi:include href="swamid-testing/devrb.lbic.lu.se.xml"/>
-  <xi:include href="swamid-testing/id.test.easyvote.se-saml2.xml"/>
+  <xi:include href="swamid-testing/devrb.lbic.lu.se-.xml"/>
+  <xi:include href="swamid-testing/id.test.easyvote.se-Saml2.xml"/>
   <xi:include href="swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-testing/konto-test.test.hb.se-Shibboleth.xml"/>
@@ -12,7 +12,7 @@
   <xi:include href="swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-testing/permitwinstaging1.caleaccess.com.xml"/>
-  <xi:include href="swamid-testing/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml"/>
+  <xi:include href="swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml"/>
   <xi:include href="swamid-testing/samlvettingspdev.test.it.gu.se.xml"/>
   <xi:include href="swamid-testing/selfservice-test.test.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-testing/sesamutvf.its.uu.se-shibboleth.xml"/>
diff --git a/swamid-testing/devrb.lbic.lu.se.xml b/swamid-testing/devrb.lbic.lu.se-.xml
index bfbb8d2c..bfbb8d2c 100644
--- a/swamid-testing/devrb.lbic.lu.se.xml
+++ b/swamid-testing/devrb.lbic.lu.se-.xml
diff --git a/swamid-testing/id.test.easyvote.se-saml2.xml b/swamid-testing/id.test.easyvote.se-Saml2.xml
index e81b4476..e81b4476 100644
--- a/swamid-testing/id.test.easyvote.se-saml2.xml
+++ b/swamid-testing/id.test.easyvote.se-Saml2.xml
diff --git a/swamid-testing/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml b/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml
index fe7687b1..fe7687b1 100644
--- a/swamid-testing/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml