diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 869a8c600a..fad299b059 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -232,11 +232,11 @@ $lang = array(
 	'DISPLAY_TOPICS' => 'Display topics from previous',
 	'ALL_TOPICS' => 'All Topics',
 
-	'TOPIC_ANNOUNCEMENT'=> '<b>Announcement:</b>',
-	'TOPIC_STICKY'		=> '<b>Sticky:</b>',
-	'TOPIC_MOVED'		=> '<b>Moved:</b>',
-	'TOPIC_POLL'		=> '<b>Poll:</b>',
-	'TOPIC_LOCKED'		=> '<b>Locked:</b>',
+	'VIEW_TOPIC_ANNOUNCEMENT'=> '<b>Announcement:</b>',
+	'VIEW_TOPIC_STICKY'		=> '<b>Sticky:</b>',
+	'VIEW_TOPIC_MOVED'		=> '<b>Moved:</b>',
+	'VIEW_TOPIC_POLL'		=> '<b>Poll:</b>',
+	'VIEW_TOPIC_LOCKED'		=> '<b>Locked:</b>',
 
 	'MARK_TOPICS_READ' => 'Mark all topics read',
 	'Topics_marked_read' => 'The topics for this forum have now been marked read',
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 067955751d..147583472c 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -318,7 +318,7 @@ if ($forum_data['forum_postable'])
 			$topic_type = '';
 			if ($row['topic_status'] == ITEM_MOVED)
 			{
-				$topic_type = $user->lang['TOPIC_MOVED'] . ' ';
+				$topic_type = $user->lang['VIEW_TOPIC_MOVED'] . ' ';
 				$topic_id = $row['topic_moved_id'];
 
 				$folder_image = 'folder';
@@ -330,13 +330,13 @@ if ($forum_data['forum_postable'])
 				switch ($row['topic_type'])
 				{
 					case POST_ANNOUNCE:
-						$topic_type = $user->lang['TOPIC_ANNOUNCEMENT'] . ' ';
+						$topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'] . ' ';
 						$folder = 'folder_announce';
 						$folder_new = 'folder_announce_new';
 						break;
 
 					case POST_STICKY:
-						$topic_type = $user->lang['TOPIC_STICKY'] . ' ';
+						$topic_type = $user->lang['VIEW_TOPIC_STICKY'] . ' ';
 						$folder = 'folder_sticky';
 						$folder_new = 'folder_sticky_new';
 						break;
@@ -357,7 +357,7 @@ if ($forum_data['forum_postable'])
 
 				if ($row['topic_status'] == ITEM_LOCKED)
 				{
-					$topic_type = $user->lang['TOPIC_LOCKED'] . ' ';
+					$topic_type = $user->lang['VIEW_TOPIC_LOCKED'] . ' ';
 					$folder = 'folder_locked';
 					$folder_new = 'folder_locked_new';
 				}
@@ -387,7 +387,7 @@ if ($forum_data['forum_postable'])
 
 			if (intval($row['poll_start']))
 			{
-				$topic_type .= $user->lang['Topic_Poll'] . ' ';
+				$topic_type .= $user->lang['VIEW_TOPIC_POLL'] . ' ';
 			}