diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 61749046c4..e6022e3b79 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -162,7 +162,7 @@ $lang = array_merge($lang, array(
 	'DISPLAY_POSTS'			=> 'Display posts from previous',
 	'DISPLAY_TOPICS'		=> 'Display topics from previous',
 	'DOWNLOAD_ALL'			=> 'Download all',
-	'DOWNLOAD_ALL_ATTACH'	=> 'Download all attachments',
+	'DOWNLOAD_ALL_ATTACHMENTS'	=> 'Download all attachments',
 	'DOWNLOADED'			=> 'Downloaded',
 	'DOWNLOADING_FILE'		=> 'Downloading file',
 	'DOWNLOAD_COUNTS'		=> array(
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index d2dbe8a581..4534dc5bcc 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -159,7 +159,7 @@
 				<dl class="attachbox">
 					<dt>
 						{L_ATTACHMENTS}
-						<!-- IF postrow.S_MULTIPLE_ATTACH -->
+						<!-- IF postrow.S_MULTIPLE_ATTACHMENTS -->
 							<div class="dl_links">
 								<strong>{L_DOWNLOAD_ALL}:</strong>
 								<ul>
@@ -270,7 +270,7 @@
 
 	<!-- IF S_HAS_ATTACHMENTS -->
 		<div class="dl_links">
-			<strong>{L_DOWNLOAD_ALL_ATTACH}:</strong>
+			<strong>{L_DOWNLOAD_ALL_ATTACHMENTS}:</strong>
 			<ul>
 			<!-- BEGIN dl_method -->
 				<li>[ <a href="{dl_method.LINK}">{dl_method.TYPE}</a> ]</li>
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 41566219b9..036f70e729 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1566,7 +1566,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'POSTER_ID'			=> $poster_id,
 
 		'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
-		'S_MULTIPLE_ATTACH'	=> !empty($attachments[$row['post_id']]) && sizeof($attachments[$row['post_id']]) > 1,
+		'S_MULTIPLE_ATTACHMENTS'	=> !empty($attachments[$row['post_id']]) && sizeof($attachments[$row['post_id']]) > 1,
 		'S_POST_UNAPPROVED'	=> ($row['post_approved']) ? false : true,
 		'S_POST_REPORTED'	=> ($row['post_reported'] && $auth->acl_get('m_report', $forum_id)) ? true : false,
 		'S_DISPLAY_NOTICE'	=> $display_notice && $row['post_attachment'],