diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 8cb6685d9f..c4d9497956 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -158,7 +158,7 @@ class acp_extensions
 			$md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template);
 			
 			$template->assign_block_vars('enabled', array(
-				'EXT_NAME'		=> $md_manager->get_metadata('name'),
+				'EXT_NAME'		=> $md_manager->get_metadata('display-name'),
 
 				'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . $name,
 				'U_PURGE'		=> $this->u_action . '&action=purge_pre&ext_name=' . $name,
@@ -181,7 +181,7 @@ class acp_extensions
 			$md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template);
 			
 			$template->assign_block_vars('disabled', array(
-				'EXT_NAME'		=> $md_manager->get_metadata('name'),
+				'EXT_NAME'		=> $md_manager->get_metadata('display-name'),
 
 				'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . $name,
 				'U_PURGE'		=> $this->u_action . '&action=purge_pre&ext_name=' . $name,
@@ -207,7 +207,7 @@ class acp_extensions
 			$md_manager = $phpbb_extension_manager->get_extension_metadata($name, $template);
 
 			$template->assign_block_vars('disabled', array(
-				'EXT_NAME'		=> $md_manager->get_metadata('name'),
+				'EXT_NAME'		=> $md_manager->get_metadata('display-name'),
 
 				'U_DETAILS'		=> $this->u_action . '&action=details&ext_name=' . $name,
 				//'U_DELETE'		=> $this->u_action . '&action=delete_pre&ext_name=' . $name,
diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index ddec918732..6af02e47b7 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -55,7 +55,7 @@ class phpbb_extension_metadata_manager
 	 * Processes and gets the metadata requested
 	 * 
 	 * @param  string $element         All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term.
-	 * @param  boolean $template_output   True if you want the requested metadata assigned to template vars
+	 * @param  boolean $template_output   True if you want the requested metadata assigned to template vars (only works on the 'all" case
 	 * @return array                   Contains all of the requested metadata
 	 */
 	public function get_metadata($element = 'all', $template_output = false)
@@ -89,20 +89,17 @@ class phpbb_extension_metadata_manager
 			break;
 			
 			case 'name':
-				if ($this->validate_name())
+				return ($this->validate_name()) ? $this->metadata['name'] : false;
+			break;
+			
+			case 'display-name':
+				if ($this->validate_extra_display_name())
 				{
-					if ($template_output)
-					{
-						$template->assign_vars(array(
-							'MD_NAME'	=> htmlspecialchars($this->metadata['name']),
-						));
-					}
-					
-					return $this->metadata['name'];
+					return $this->metadata['extra']['display-name'];
 				}
 				else
 				{
-					return false;
+					return ($this->validate_name()) ? $this->metadata['name'] : false;
 				}
 			break;
 			// TODO: Add remaining cases as needed