diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index d000fc49d2..94dbb9bb51 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -230,7 +230,7 @@ else if ($download_id)
 	{
 		if (!$attachment['in_message'])
 		{
-			phpbb_download_check_forum_auth($db, $auth, $attachment['topic_id']);
+			phpbb_download_handle_forum_auth($db, $auth, $attachment['topic_id']);
 		}
 		else
 		{
@@ -302,7 +302,7 @@ else
 	// sizeof($attachments) >= 1
 	if (!$attachment['in_message'])
 	{
-		phpbb_download_check_forum_auth($db, $auth, $attachment['topic_id']);
+		phpbb_download_handle_forum_auth($db, $auth, $attachment['topic_id']);
 	}
 	else
 	{
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index ac5e5ddd7e..ed2f598429 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -615,7 +615,7 @@ function phpbb_increment_downloads($db, $ids)
 }
 
 /**
-* Checks that the user has permission to download attachments from the forum
+* Handles authentication when downloading attachments from a post or topic
 *
 * @param dbal $db The database object
 * @param phpbb_auth $auth The authentication object
@@ -623,7 +623,7 @@ function phpbb_increment_downloads($db, $ids)
 *
 * @return null
 */
-function phpbb_download_check_forum_auth($db, $auth, $topic_id)
+function phpbb_download_handle_forum_auth($db, $auth, $topic_id)
 {
 	$sql = 'SELECT t.forum_id, f.forum_password, f.parent_id
 		FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f