diff --git a/modules/adfs/www/idp/metadata.php b/modules/adfs/www/idp/metadata.php
index df59f5adace63f66108f8fe5fc5e7d9b106873c1..b52f8ef5b3759fd2463bd448e5c1d81abff0c107 100644
--- a/modules/adfs/www/idp/metadata.php
+++ b/modules/adfs/www/idp/metadata.php
@@ -148,7 +148,8 @@ try {
 
         $t->data['clipboard.js'] = true;
         $t->data['available_certs'] = $availableCerts;
-        $t->data['header'] = 'adfs-idp';
+        $t->data['header'] = 'adfs-idp'; // TODO: Replace with headerString in 2.0
+        $t->data['headerString'] = $t->noop('metadata_adfs-idp');
         $t->data['metaurl'] = \SimpleSAML\Utils\HTTP::getSelfURLNoQuery();
         $t->data['metadata'] = htmlspecialchars($metaxml);
         $t->data['metadataflat'] = htmlspecialchars($metaflat);
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 3adf70df0e3de4932d560740e09a85936932de0e..781d00703198f21c5b0811ef76d2fc1e38cf3bca 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -242,7 +242,8 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
     $t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
 
     $t->data['clipboard.js'] = true;
-    $t->data['header'] = 'saml20-sp';
+    $t->data['header'] = 'saml20-sp'; // TODO: Replace with headerString in 2.0
+    $t->data['headerString'] = $t->noop('metadata_saml20-sp');
     $t->data['metadata'] = htmlspecialchars($xml);
     $t->data['metadataflat'] = '$metadata['.var_export($entityId, true).'] = '.var_export($metaArray20, true).';';
     $t->data['metaurl'] = $source->getMetadataURL();
diff --git a/templates/metadata.php b/templates/metadata.php
index 99f5f60fe6be39f79c25de89d124cbab5147b589..483a321be67cd6e78d33211d9f08d9a18ff4ceb5 100644
--- a/templates/metadata.php
+++ b/templates/metadata.php
@@ -1,5 +1,5 @@
 <?php
-$this->data['header'] = $this->t('metadata_'.$this->data['header']);
+$this-data['header'] = $this->t($this->data['headerString']);
 $this->includeAtTemplateBase('includes/header.php'); ?>
     <h2><?php echo $this->data['header']; ?></h2>
     <p><?php echo $this->t('metadata_intro'); ?></p>
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 2697640187408bc8b1a2888208827cb207e86b11..897f22d31b662c0b51d77656d79ef9f1d6e5cb3b 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -211,7 +211,8 @@ try {
 
         $t->data['clipboard.js'] = true;
         $t->data['available_certs'] = $availableCerts;
-        $t->data['header'] = 'saml20-idp';
+        $t->data['header'] = 'saml20-idp'; // TODO: Replace with headerString in 2.0
+        $t->data['headerString'] = $t->noop('metadata_saml20-idp');
         $t->data['metaurl'] = HTTP::getSelfURLNoQuery();
         $t->data['metadata'] = htmlspecialchars($metaxml);
         $t->data['metadataflat'] = htmlspecialchars($metaflat);
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index f9f5af315a1ad9c55f8dbdacf98e2c5b205308ee..23c3f6857c3638b4b51dfdcb768e2c92bd540f31 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -90,7 +90,8 @@ try {
         $t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
 
         $t->data['clipboard.js'] = true;
-        $t->data['header'] = 'shib13-idp';
+        $t->data['header'] = 'shib13-idp'; // TODO: Replace with headerString in 2.0
+        $t->data['headerString'] = $t->noop('metadata_shib13-idp');
         $t->data['metaurl'] = \SimpleSAML\Utils\HTTP::addURLParameters(
             \SimpleSAML\Utils\HTTP::getSelfURLNoQuery(),
             array('output' => 'xml')