diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index ebf1a948177dedcc670330fb665b65ba70d4dd87..220d3018167e4f3d00969507cd65914773b162cb 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -270,7 +270,7 @@ if (isset($metaArray20['attributes']) && is_array($metaArray20['attributes'])) {
 $xml = \SimpleSAML\Metadata\Signer::sign($xml, $spconfig->toArray(), 'SAML 2 SP');
 
 if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
-    $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.tpl.php', 'admin');
+    $t = new \SimpleSAML\XHTML\Template($config, 'metadata.tpl.php', 'admin');
 
     $t->data['clipboard.js'] = true;
     $t->data['header'] = 'saml20-sp'; // TODO: Replace with headerString in 2.0
diff --git a/modules/saml/templates/metadata.tpl.php b/templates/metadata.tpl.php
similarity index 100%
rename from modules/saml/templates/metadata.tpl.php
rename to templates/metadata.tpl.php
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 1fce62b9d9a8fda05eccae8ad1bd41b04d7546a2..15ee592f5af67bd61249c876aa1d62c9d08de2c2 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -214,7 +214,7 @@ try {
     if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
         $defaultidp = $config->getString('default-saml20-idp', null);
 
-        $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.php', 'admin');
+        $t = new \SimpleSAML\XHTML\Template($config, 'metadata.tpl.php', 'admin');
 
         $t->data['clipboard.js'] = true;
         $t->data['available_certs'] = $availableCerts;
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index d1f012e19c16f716f85fd3bd904805acce0c3aa3..d8063b444750ae43935e6137913b28efa353cdbf 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -84,7 +84,7 @@ try {
     if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
         $defaultidp = $config->getString('default-shib13-idp', null);
 
-        $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.php', 'admin');
+        $t = new \SimpleSAML\XHTML\Template($config, 'metadata.tpl.php', 'admin');
 
         $t->data['clipboard.js'] = true;
         $t->data['header'] = 'shib13-idp'; // TODO: Replace with headerString in 2.0