diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php
index c522e25b..21a2677c 100644
--- a/web/html/pkgdel.php
+++ b/web/html/pkgdel.php
@@ -12,7 +12,7 @@ html_header(__("Package Deletion"));
 
 if (has_credential(CRED_PKGBASE_DELETE)): ?>
 <div class="box">
-	<h2><?= __('Delete Package: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<h2><?= __('Delete Package') ?>: <? htmlspecialchars($pkgbase_name) ?></h2>
 	<p>
 		<?= __('Use this form to delete the package base %s%s%s and the following packages from the AUR: ',
 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php
index 7ca6e6a1..f24a2d6d 100644
--- a/web/html/pkgdisown.php
+++ b/web/html/pkgdisown.php
@@ -15,7 +15,7 @@ $comaintainers = pkgbase_get_comaintainers($base_id);
 
 if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?>
 <div class="box">
-	<h2><?= __('Disown Package: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<h2><?= __('Disown Package') ?>: <? htmlspecialchars($pkgbase_name) ?></h2>
 	<p>
 		<?= __('Use this form to disown the package base %s%s%s which includes the following packages: ',
 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
diff --git a/web/html/pkgflag.php b/web/html/pkgflag.php
index e6e7c647..f50c2085 100644
--- a/web/html/pkgflag.php
+++ b/web/html/pkgflag.php
@@ -43,7 +43,7 @@ html_header(__("Flag Package Out-Of-Date"));
 
 if (has_credential(CRED_PKGBASE_FLAG)): ?>
 <div class="box">
-	<h2><?= __('Flag Package Out-Of-Date: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<h2><?= __('Flag Package Out-Of-Date') ?>: <? htmlspecialchars($pkgbase_name) ?></h2>
 	<p>
 		<?= __('Use this form to flag the package base %s%s%s and the following packages out-of-date: ',
 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php
index 35113902..c0ce655c 100644
--- a/web/html/pkgmerge.php
+++ b/web/html/pkgmerge.php
@@ -12,7 +12,7 @@ html_header(__("Package Merging"));
 
 if (has_credential(CRED_PKGBASE_DELETE)): ?>
 <div class="box">
-	<h2><?= __('Merge Package: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<h2><?= __('Merge Package') ?>: <? htmlspecialchars($pkgbase_name) ?></h2>
 	<p>
 		<?= __('Use this form to merge the package base %s%s%s into another package. ',
 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
diff --git a/web/template/comaintainers_form.php b/web/template/comaintainers_form.php
index 050f2550..70a74645 100644
--- a/web/template/comaintainers_form.php
+++ b/web/template/comaintainers_form.php
@@ -1,5 +1,5 @@
 <div class="box">
-	<h2><?= __('Manage Co-maintainers: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<h2><?= __('Manage Co-maintainers') ?>: <? htmlspecialchars($pkgbase_name) ?></h2>
 	<p>
 		<?= __('Use this form to add co-maintainers for %s%s%s (one user name per line):',
 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
diff --git a/web/template/pkgreq_close_form.php b/web/template/pkgreq_close_form.php
index 00efafef..59e9c8f4 100644
--- a/web/template/pkgreq_close_form.php
+++ b/web/template/pkgreq_close_form.php
@@ -1,5 +1,5 @@
 <div class="box">
-	<h2><?= __('Close Request: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<h2><?= __('Close Request') ?>: <? htmlspecialchars($pkgbase_name) ?></h2>
 	<p>
 		<?= __('Use this form to close the request for package base %s%s%s.',
 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
index 6cf8588d..5bd2bfe9 100644
--- a/web/template/pkgreq_form.php
+++ b/web/template/pkgreq_form.php
@@ -1,5 +1,5 @@
 <div class="box">
-	<h2><?= __('Submit Request: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<h2><?= __('Submit Request') ?>: <? htmlspecialchars($pkgbase_name) ?></h2>
 	<p>
 		<?= __('Use this form to file a request against package base %s%s%s which includes the following packages:',
 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>